From 9853c5dea8b12f0a2d159acc19d285e70cf6058d Mon Sep 17 00:00:00 2001 From: Nico Kaiser Date: Thu, 10 May 2012 14:48:35 +0200 Subject: [PATCH] Use sha1 instead of md5, reorder conditions for table status caching and avoid too many if's --- libraries/database_interface.lib.php | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index 1fd4a19b0e..3cf4244ac3 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -517,22 +517,19 @@ function PMA_DBI_get_tables_full($database, $table = false, $useStatusCache = false; - if (isset($GLOBALS['cfg']['Server']['StatusCacheDatabases'])) { - if (!empty($GLOBALS['cfg']['Server']['StatusCacheLifetime'])) { - if (extension_loaded('apc')) { - $statusCacheDatabases = (array) $GLOBALS['cfg']['Server']['StatusCacheDatabases']; - - if (in_array($each_database, $statusCacheDatabases)) { - $useStatusCache = true; - } - } + if (extension_loaded('apc') + && isset($GLOBALS['cfg']['Server']['StatusCacheDatabases']) + && ! empty($GLOBALS['cfg']['Server']['StatusCacheLifetime'])) { + $statusCacheDatabases = (array) $GLOBALS['cfg']['Server']['StatusCacheDatabases']; + if (in_array($each_database, $statusCacheDatabases)) { + $useStatusCache = true; } } $each_tables = null; if ($useStatusCache) { - $cacheKey = 'phpMyAdmin_tableStatus_' . md5($GLOBALS['cfg']['Server']['host'] . '_' . $sql); + $cacheKey = 'phpMyAdmin_tableStatus_' . sha1($GLOBALS['cfg']['Server']['host'] . '_' . $sql); $each_tables = apc_fetch($cacheKey); }