From b6073bf722331934cb4aaff3d8abdccdb6aab660 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 11 Jun 2013 08:52:51 +0200 Subject: [PATCH 1/4] Whitespace cleanup --- index.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index b2013fd229..2c3ec25f6b 100644 --- a/index.php +++ b/index.php @@ -117,9 +117,9 @@ if ($server > 0 || count($cfg['Servers']) > 1 /** * Displays the MySQL servers choice form */ - if ($cfg['ServerDefault'] == 0 + if ($cfg['ServerDefault'] == 0 || (! $cfg['NavigationDisplayServers'] - && (count($cfg['Servers']) > 1 + && (count($cfg['Servers']) > 1 || ($server == 0 && count($cfg['Servers']) == 1) ) ) From d34f8d5182b34519de2b5b6778d09c49da5111dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 11 Jun 2013 08:57:49 +0200 Subject: [PATCH 2/4] Disable response wrapper in fatal error path There might be some critical pieces (eg. json, pcre or session) missing and there is no way to make Response class working at this point. Fixes #3981 --- libraries/error.inc.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libraries/error.inc.php b/libraries/error.inc.php index 7e3f8ae118..c48a7f1422 100644 --- a/libraries/error.inc.php +++ b/libraries/error.inc.php @@ -13,10 +13,6 @@ if (! defined('PHPMYADMIN')) { if (! defined('TESTSUITE')) { header('Content-Type: text/html; charset=utf-8'); } - -require_once 'libraries/Response.class.php'; -PMA_Response::getInstance()->disable(); - ?> From a019f7e7b7f5b92982af2f54c23d4d5fb8348719 Mon Sep 17 00:00:00 2001 From: Dadan Setia Date: Tue, 11 Jun 2013 05:51:55 +0200 Subject: [PATCH 3/4] Translated using Weblate (Indonesian) Currently translated at 74.8% (1947 of 2603) --- po/id.po | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/po/id.po b/po/id.po index 5c561ddc78..879e0fd1df 100644 --- a/po/id.po +++ b/po/id.po @@ -4,7 +4,7 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.4-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-06-03 09:16-0400\n" -"PO-Revision-Date: 2013-06-09 18:28+0200\n" +"PO-Revision-Date: 2013-06-11 05:51+0200\n" "Last-Translator: Dadan Setia \n" "Language-Team: Indonesian " "\n" @@ -13190,6 +13190,9 @@ msgid "" "that do not close database handlers properly get killed sooner. Make sure " "the code closes database handlers properly." msgstr "" +"Menaikan{max_connections}, atau mengurangi {wait_timeout} sehingga tidak " +"menutupi penanganan basis data dengan baik, dapat mematikannya. Pastikan " +"kode menutupi penanganan basis data dengan benar." #: libraries/advisory_rules.txt:397 #, php-format From 5e6d3eaa53f9267527d8006084189b995f487941 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 11 Jun 2013 08:59:58 +0200 Subject: [PATCH 4/4] Whitespace cleanup --- libraries/core.lib.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/core.lib.php b/libraries/core.lib.php index c7412a9a93..e5766e51e4 100644 --- a/libraries/core.lib.php +++ b/libraries/core.lib.php @@ -305,7 +305,7 @@ function PMA_warnMissingExtension($extension, $fatal = false, $extra = '') PMA_fatalError($message); } else { $GLOBALS['error_handler']->addError( - $message, + $message, E_USER_WARNING, '', '',