[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_5RC1-5936-g15dfc48

[Michal Čihař]

The branch, master has been updated
       via  15dfc4879ec8f8273bdec711597e118bd938653c (commit)
      from  412bdd6515420d7410c8265e7ce4a99a0787d438 (commit)


- Log -----------------------------------------------------------------
commit 15dfc4879ec8f8273bdec711597e118bd938653c
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon Jul 26 13:29:29 2010 +0200

    Drop collation description cache.
    
    It really does not improve performance much and it just consumes memory.
    Anyway on most pages this function is called just once for each
    collation, so all it does is filling up the cache but never using it.

-----------------------------------------------------------------------

Summary of changes:
 libraries/mysql_charsets.lib.php |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/libraries/mysql_charsets.lib.php b/libraries/mysql_charsets.lib.php
index 303c637..db31ece 100644
--- a/libraries/mysql_charsets.lib.php
+++ b/libraries/mysql_charsets.lib.php
@@ -198,14 +198,6 @@ function PMA_getServerCollation() {
  * @return  string  collation description
  */
 function PMA_getCollationDescr($collation) {
-    static $collation_cache;
-
-    if (!is_array($collation_cache)) {
-        $collation_cache = array();
-    } elseif (isset($collation_cache[$collation])) {
-        return $collation_cache[$collation];
-    }
-
     if ($collation == 'binary') {
         return __('Binary');
     }


hooks/post-receive
-- 
phpMyAdmin