Merge branch 'QA_4_6'

phpmyadmin · Mar 16, 2016 · 251cd5d · 251cd5d
2 parents 46dee5d + 902b41e
commit 251cd5d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -67,6 +67,7 @@ phpMyAdmin - ChangeLog
 - issue #12085 Like search strings being escaped incorrectly
 - issue #12092 Rename exported databases/tables doesn't seem to work
 - issue #12099 Undefined index: controllink
+- issue #12092 PHP Fatal error: Call to undefined function __()
 
 4.5.5.1 (2016-02-29)
 - issue #11971 CREATE UNIQUE INDEX index type is not recognized by parser.

diff --git a/libraries/controllers/database/DatabaseStructureController.php b/libraries/controllers/database/DatabaseStructureController.php
@@ -870,6 +870,8 @@ protected function synchronizeFavoriteTables(
      */
     protected function checkFavoriteTable($current_table)
     {
+        // ensure $_SESSION['tmpval']['favorite_tables'] is initialized
+        RecentFavoriteTable::getInstance('favorite');
         foreach (
             $_SESSION['tmpval']['favorite_tables'][$GLOBALS['server']] as $value
         ) {