diff options
author | Christian Foellmann <foellmann@foe-services.de> | 2015-01-07 22:30:46 +0300 |
---|---|---|
committer | Christian Foellmann <foellmann@foe-services.de> | 2015-01-07 22:30:46 +0300 |
commit | 72f864ff50d01b8bc18904db7a6ba4fa32c44783 (patch) | |
tree | 5e21bb2e65452081461e762eab72e5d8c577dec5 | |
parent | 170cb05f4eec4322303658108f9eea6e55163e50 (diff) |
UPDATE 4.3.64.3.6
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | js/pmd/designer_page.js | 2 | ||||
-rw-r--r-- | libraries/Config.class.php | 2 | ||||
-rw-r--r-- | libraries/Menu.class.php | 4 | ||||
-rw-r--r-- | libraries/RecentFavoriteTable.class.php | 4 | ||||
-rw-r--r-- | libraries/common.inc.php | 11 | ||||
-rw-r--r-- | libraries/config/setup.forms.php | 2 | ||||
-rw-r--r-- | libraries/language_stats.inc.php | 2 | ||||
-rw-r--r-- | locale/el/LC_MESSAGES/phpmyadmin.mo | bin | 459637 -> 460751 bytes | |||
-rw-r--r-- | locale/sk/LC_MESSAGES/phpmyadmin.mo | bin | 220622 -> 222111 bytes | |||
-rw-r--r-- | locale/sq/LC_MESSAGES/phpmyadmin.mo | bin | 0 -> 346668 bytes | |||
-rw-r--r-- | themes/pmahomme/css/common.css.php | 9 |
13 files changed, 30 insertions, 18 deletions
@@ -1,6 +1,16 @@ phpMyAdmin - ChangeLog ====================== +4.3.6.0 (2015-01-07) +- bug Undefined index notices while configuring recent and favorite tables +- bug #4687 Designer breaks without configuration storage +- bug #4686 Select elements flicker and selects something else +- bug #4689 Setup tool creates "pma__favorites" incorrectly +- bug #4685 Call to a member function isUserType() on a non-object +- bug #4691 Do not include console when no server is selected +- bug #4688 File permissions in archive +- bug #4692 Dynamic javascripts gives 500 when db selected + 4.3.5.0 (2015-01-05) - bug Auto-configuration: tables were not created automatically - bug #4677 Advanced feature checker does not check for favorite tables feature @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.3.5 +Version 4.3.6 A set of PHP-scripts to manage MySQL over the web. diff --git a/js/pmd/designer_page.js b/js/pmd/designer_page.js index d56df13b6e..4ef3f28429 100644 --- a/js/pmd/designer_page.js +++ b/js/pmd/designer_page.js @@ -97,10 +97,10 @@ function Show_new_page_tables(check) for (var tab in all_tables) { var input = all_tables[tab]; if (input.value) { - VisibleTab(input, input.value); var element = document.getElementById(input.value); element.style.top = Get_random(550, 20) + 'px'; element.style.left = Get_random(700, 20) + 'px'; + VisibleTab(input, input.value); } } selected_page = -1; diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 3508138822..de90899621 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -114,7 +114,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '4.3.5'); + $this->set('PMA_VERSION', '4.3.6'); /** * @deprecated */ diff --git a/libraries/Menu.class.php b/libraries/Menu.class.php index a9f2b15afb..a4b537e8ab 100644 --- a/libraries/Menu.class.php +++ b/libraries/Menu.class.php @@ -507,13 +507,13 @@ class PMA_Menu */ private function _getServerTabs() { - $is_superuser = isset($GLOBALS['dbi']) && $GLOBALS['dbi']->isSuperuser(); + $is_superuser = $GLOBALS['dbi']->isSuperuser(); $isCreateOrGrantUser = $GLOBALS['dbi']->isUserType('grant') || $GLOBALS['dbi']->isUserType('create'); $binary_logs = null; $notDrizzle = ! defined('PMA_DRIZZLE') || (defined('PMA_DRIZZLE') && ! PMA_DRIZZLE); - if (isset($GLOBALS['dbi']) && $notDrizzle) { + if ($notDrizzle) { if (PMA_Util::cacheExists('binary_logs')) { $binary_logs = PMA_Util::cacheGet('binary_logs'); } else { diff --git a/libraries/RecentFavoriteTable.class.php b/libraries/RecentFavoriteTable.class.php index 2cf934b3ca..8582cef5f6 100644 --- a/libraries/RecentFavoriteTable.class.php +++ b/libraries/RecentFavoriteTable.class.php @@ -381,8 +381,8 @@ class PMA_RecentFavoriteTable private function _getPmaTable() { $cfgRelation = PMA_getRelationsParam(); - if (/*overload*/mb_strlen($cfgRelation['db']) - && /*overload*/mb_strlen($cfgRelation[$this->_tableType]) + if (! empty($cfgRelation['db']) + && ! empty($cfgRelation[$this->_tableType]) ) { return PMA_Util::backquote($cfgRelation['db']) . "." . PMA_Util::backquote($cfgRelation[$this->_tableType]); diff --git a/libraries/common.inc.php b/libraries/common.inc.php index ff55609645..d06b37aea7 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -1042,7 +1042,13 @@ if (! defined('PMA_MINIMUM_COMMON')) { } $_SESSION['tmpval']['previous_server'] = $GLOBALS['server']; - } // end server connecting + } else { // end server connecting + // No need to check for 'PMA_BYPASS_GET_INSTANCE' since this execution path + // applies only to initial login + $response = PMA_Response::getInstance(); + $response->getHeader()->disableMenuAndConsole(); + $response->getFooter()->setMinimal(); + } /** * check if profiling was requested and remember it @@ -1148,7 +1154,8 @@ if (!empty($__redirect) && in_array($__redirect, $goto_whitelist)) { } // If Zero configuration mode enabled, check PMA tables in current db. -if (isset($GLOBALS['cfg']['ZeroConf']) +if (! defined('PMA_MINIMUM_COMMON') + && isset($GLOBALS['cfg']['ZeroConf']) && $GLOBALS['cfg']['ZeroConf'] == true ) { if (! empty($GLOBALS['db'])) { diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index 68b409efb7..8c285f8d53 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -75,7 +75,7 @@ $forms['Servers']['Server_pmadb'] = array('Servers' => array(1 => array( 'column_info' => 'pma__column_info', 'history' => 'pma__history', 'recent' => 'pma__recent', - 'favorite' => 'pma_favorite', + 'favorite' => 'pma__favorite', 'table_uiprefs' => 'pma__table_uiprefs', 'tracking' => 'pma__tracking', 'table_coords' => 'pma__table_coords', diff --git a/libraries/language_stats.inc.php b/libraries/language_stats.inc.php index 417d7173ba..430e8bc024 100644 --- a/libraries/language_stats.inc.php +++ b/libraries/language_stats.inc.php @@ -61,7 +61,7 @@ $GLOBALS["language_stats"] = array ( 'si' => 67, 'sk' => 76, 'sl' => 99, - 'sq' => 25, + 'sq' => 100, 'sr@latin' => 51, 'sr' => 25, 'sv' => 91, diff --git a/locale/el/LC_MESSAGES/phpmyadmin.mo b/locale/el/LC_MESSAGES/phpmyadmin.mo Binary files differindex e747d1aedc..78de6f2e19 100644 --- a/locale/el/LC_MESSAGES/phpmyadmin.mo +++ b/locale/el/LC_MESSAGES/phpmyadmin.mo diff --git a/locale/sk/LC_MESSAGES/phpmyadmin.mo b/locale/sk/LC_MESSAGES/phpmyadmin.mo Binary files differindex b72f639763..e0afd7033a 100644 --- a/locale/sk/LC_MESSAGES/phpmyadmin.mo +++ b/locale/sk/LC_MESSAGES/phpmyadmin.mo diff --git a/locale/sq/LC_MESSAGES/phpmyadmin.mo b/locale/sq/LC_MESSAGES/phpmyadmin.mo Binary files differnew file mode 100644 index 0000000000..ef2de0e0bf --- /dev/null +++ b/locale/sq/LC_MESSAGES/phpmyadmin.mo diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index f0cd137d92..19f6664fa8 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -246,20 +246,15 @@ input[type=number]:hover, input[type=number]:focus, input[type=date]:hover, input[type=date]:focus, -select:focus, -select:hover { - +select:focus { border: 1px solid #7c7c7c; - - background: #fff; } input[type=text]:hover, input[type=password]:hover, input[type=number]:hover, -input[type=date]:hover, -select:hover { +input[type=date]:hover { box-shadow: 0 1px 3px #aaa; -webkit-box-shadow: 0 1px 3px #aaa; -moz-box-shadow: 0 1px 3px #aaa; |