dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// small fix

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17441 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rGaillard
2012-09-20 14:04:15 +00:00
parent 88a80b624b
commit ea1ad666f7
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/cache/Cache.php
Vendored
+11 -6
View File
@@ -248,13 +248,21 @@ abstract class CacheCore
$this->set($key, $result); $this->set($key, $result);
// Get all table from the query and save them in cache // Get all table from the query and save them in cache
if (preg_match_all('/('._DB_PREFIX_.'[a-z_-]*)`?.*/i', $query, $res)) if ($tables = $this->getTables($query))
foreach ($res[1] as $table) foreach ($tables as $table)
if (!isset($this->sql_tables_cached[$table][$key])) if (!isset($this->sql_tables_cached[$table][$key]))
$this->sql_tables_cached[$table][$key] = true; $this->sql_tables_cached[$table][$key] = true;
$this->set(self::SQL_TABLES_NAME, $this->sql_tables_cached); $this->set(self::SQL_TABLES_NAME, $this->sql_tables_cached);
} }
protected function getTables($string)
{
if (preg_match_all('/(?:from|join|update|into)\s+`?('._DB_PREFIX_.'[a-z_-]+)`?(?:,\s{0,}`?('._DB_PREFIX_.'[a-z_-]+)`?)?\s.*/Umsi', $string, $res))
return array_merge($res[1], $res[2]);
else
return false;
}
/** /**
* Delete a query from cache * Delete a query from cache
* *
@@ -269,9 +277,7 @@ abstract class CacheCore
$this->sql_tables_cached = array(); $this->sql_tables_cached = array();
} }
if (preg_match_all('/(?:from|join|update|into)\s+`?('._DB_PREFIX_.'[a-z_-]+)`?(?:,\s{0,}`?('._DB_PREFIX_.'[a-z_-]+)`?)?\s.*/Umsi', $query, $res)) if ($tables = $this->getTables($query))
{
$tables = array_merge($res[1], $res[2]);
foreach ($tables as $table) foreach ($tables as $table)
if (isset($this->sql_tables_cached[$table])) if (isset($this->sql_tables_cached[$table]))
{ {
@@ -282,7 +288,6 @@ abstract class CacheCore
} }
unset($this->sql_tables_cached[$table]); unset($this->sql_tables_cached[$table]);
} }
}
$this->set(self::SQL_TABLES_NAME, $this->sql_tables_cached); $this->set(self::SQL_TABLES_NAME, $this->sql_tables_cached);
} }