From cc0c82e2a3b3806ac4df76e89a3d52e4bf8d004d Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 3 Dec 2014 09:09:50 -0500 Subject: [PATCH 1/4] 4.3.0-rc2 release Signed-off-by: Marc Delisle --- README | 2 +- doc/conf.py | 2 +- libraries/Config.class.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README b/README index adac8f27c4..9f90d4fa68 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ phpMyAdmin - Readme =================== -Version 4.3.0-rc1 +Version 4.3.0-rc2 A set of PHP-scripts to manage MySQL over the web. diff --git a/doc/conf.py b/doc/conf.py index 1633996160..1afb5b68ac 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -51,7 +51,7 @@ copyright = u'2012 - 2014, The phpMyAdmin devel team' # built documents. # # The short X.Y version. -version = '4.3.0-rc1' +version = '4.3.0-rc2' # The full version, including alpha/beta/rc tags. release = version diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 98f0ba13a3..6ec4fec658 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.0-rc1'); + $this->set('PMA_VERSION', '4.3.0-rc2'); /** * @deprecated */ From 1d92e9db8740da09ae090763f796c4e73d636c62 Mon Sep 17 00:00:00 2001 From: Akos Eros Date: Wed, 3 Dec 2014 22:22:28 +0100 Subject: [PATCH 2/4] Translated using Weblate (Hungarian) Currently translated at 79.8% (2377 of 2978 strings) [CI skip] --- po/hu.po | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/po/hu.po b/po/hu.po index 4513636d18..05be2f9383 100644 --- a/po/hu.po +++ b/po/hu.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2014-11-13 11:57-0500\n" -"PO-Revision-Date: 2014-11-05 10:33+0200\n" -"Last-Translator: Michal Čihař \n" -"Language-Team: Hungarian \n" +"PO-Revision-Date: 2014-12-03 22:22+0200\n" +"Last-Translator: Akos Eros \n" +"Language-Team: Hungarian " +"\n" +"Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: hu\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 2.0-dev\n" +"X-Generator: Weblate 2.1-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -26,19 +26,18 @@ msgstr "" #: db_central_columns.php:85 msgid "The central list of columns for the current database is empty." -msgstr "" +msgstr "A központi oszlopok listája az aktuális adatbázisban üres." #: db_central_columns.php:109 -#, fuzzy #| msgid "Click to sort" msgid "Click to sort." msgstr "Kattintson a rendezéshez" #: db_central_columns.php:125 -#, fuzzy, php-format +#, php-format #| msgid "Showing rows %1s - %2s" msgid "Showing rows %1$s - %2$s." -msgstr "Sorok megjelenítése %1s-%2s" +msgstr "Sorok megjelenítése %1$s-%2$s" #: db_create.php:61 #, php-format @@ -246,7 +245,7 @@ msgid "The database name is empty!" msgstr "Üres az adatbázis neve!" #: db_operations.php:136 -#, fuzzy, php-format +#, php-format #| msgid "Database %1$s has been renamed to %2$s." msgid "Database %1$s has been renamed to %2$s." msgstr "A(z) %1$s adatbázis átnevezése %2$s névre megtörtént" From f9dc6be7e64e4853129a77ad2b04a08f4ec6bd3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 1 Dec 2014 11:56:03 +0100 Subject: [PATCH 3/4] Add missing call to test MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař --- test/classes/plugin/auth/PMA_AuthenticationCookie_test.php | 1 + 1 file changed, 1 insertion(+) diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php index 15a73c1638..46ac725d68 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php @@ -873,6 +873,7 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase $attrInstance->setValue($mockResponse); $this->object->authSetUser(); + $this->object->storeUserCredentials(); $this->assertTrue( isset($_COOKIE['pmaServer-2']) From ccc239040f7f222c6c71cde3eda316eceecff16c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 1 Dec 2014 10:42:11 +0100 Subject: [PATCH 4/4] Adjust testcase to new split methods MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michal Čihař Conflicts: test/classes/plugin/auth/PMA_AuthenticationCookie_test.php --- .../plugin/auth/PMA_AuthenticationCookie_test.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php index 46ac725d68..30bee3566c 100644 --- a/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php +++ b/test/classes/plugin/auth/PMA_AuthenticationCookie_test.php @@ -803,14 +803,15 @@ class PMA_AuthenticationCookie_Test extends PHPUnit_Framework_TestCase isset($_SERVER['PHP_AUTH_PW']) ); - // todo: Move to a distinct test for storeUserCredentials() - //$this->assertTrue( - // isset($_COOKIE['pmaUser-1']) - //); + $this->object->storeUserCredentials(); - //$this->assertTrue( - // isset($_COOKIE['pmaPass-1']) - //); + $this->assertTrue( + isset($_COOKIE['pmaUser-1']) + ); + + $this->assertTrue( + isset($_COOKIE['pmaPass-1']) + ); $arr['password'] = 'testPW'; $arr['host'] = 'b';