diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-06-22 22:49:33 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-06-22 22:49:33 +0200 |
| commit | d039f56af00fb98b2b03f54f00ce4bb1436e9932 (patch) | |
| tree | ede844c40fdf84f9c4c3be19004413418ac98b94 /phpBB/phpbb/cache/driver/memory.php | |
| parent | 50f4bea6101f64c513b3918ade58a712b00f3df7 (diff) | |
| download | forums-d039f56af00fb98b2b03f54f00ce4bb1436e9932.tar forums-d039f56af00fb98b2b03f54f00ce4bb1436e9932.tar.gz forums-d039f56af00fb98b2b03f54f00ce4bb1436e9932.tar.bz2 forums-d039f56af00fb98b2b03f54f00ce4bb1436e9932.tar.xz forums-d039f56af00fb98b2b03f54f00ce4bb1436e9932.zip | |
[ticket/12387] Use the hash as query_id for caching
PHPBB3-12387
Diffstat (limited to 'phpBB/phpbb/cache/driver/memory.php')
| -rw-r--r-- | phpBB/phpbb/cache/driver/memory.php | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/phpBB/phpbb/cache/driver/memory.php b/phpBB/phpbb/cache/driver/memory.php index 5dee375192..cb2b6a10a7 100644 --- a/phpBB/phpbb/cache/driver/memory.php +++ b/phpBB/phpbb/cache/driver/memory.php @@ -266,9 +266,9 @@ abstract class memory extends \phpbb\cache\driver\base { // Remove extra spaces and tabs $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); - $query_id = sizeof($this->sql_rowset); + $query_id = md5($query); - if (($result = $this->_read('sql_' . md5($query))) === false) + if (($result = $this->_read('sql_' . $query_id)) === false) { return false; } @@ -286,7 +286,7 @@ abstract class memory extends \phpbb\cache\driver\base { // Remove extra spaces and tabs $query = preg_replace('/[\n\r\s\t]+/', ' ', $query); - $hash = md5($query); + $query_id = md5($query); // determine which tables this query belongs to // Some queries use backticks, namely the get_database_size() query @@ -315,14 +315,13 @@ abstract class memory extends \phpbb\cache\driver\base $temp = array(); } - $temp[$hash] = true; + $temp[$query_id] = true; // This must never expire $this->_write('sql_' . $table_name, $temp, 0); } // store them in the right place - $query_id = sizeof($this->sql_rowset); $this->sql_rowset[$query_id] = array(); $this->sql_row_pointer[$query_id] = 0; @@ -332,7 +331,7 @@ abstract class memory extends \phpbb\cache\driver\base } $db->sql_freeresult($query_result); - $this->_write('sql_' . $hash, $this->sql_rowset[$query_id], $ttl); + $this->_write('sql_' . $query_id, $this->sql_rowset[$query_id], $ttl); return $query_id; } |