From a63075fed9af3cb89cbe889f3103bfc8338185e8 Mon Sep 17 00:00:00 2001 From: Burak Yavuz Date: Fri, 23 Oct 2015 19:06:18 +0200 Subject: [PATCH 1/4] Translated using Weblate (Turkish) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/tr.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/po/tr.po b/po/tr.po index d2a53a487d..86dfd6d570 100644 --- a/po/tr.po +++ b/po/tr.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-26 19:59-0400\n" -"PO-Revision-Date: 2015-10-23 19:06+0200\n" +"PO-Revision-Date: 2015-10-27 05:44+0200\n" "Last-Translator: Burak Yavuz \n" -"Language-Team: Turkish \n" +"Language-Team: Turkish " +"\n" "Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -14506,6 +14506,8 @@ msgid "" "Username and hostname didn't change. If you only want to change the " "password, 'Change password' tab should be used." msgstr "" +"Kullanıcı adı ve anabilgisayar adı değişmedi. Sadece parolayı değiştirmek " +"istiyorsanız, 'Parolayı değiştir' sekmesi kullanılmalıdır." #: server_status.php:39 msgid "Not enough privilege to view server status." From 332a61c6977d454a7a1ce8b6ee24277b70d90230 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristjan=20R=C3=A4ts?= Date: Mon, 26 Oct 2015 08:17:39 +0100 Subject: [PATCH 2/4] Translated using Weblate (Estonian) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/et.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/po/et.po b/po/et.po index 72c731f2cd..7be7def43f 100644 --- a/po/et.po +++ b/po/et.po @@ -6,10 +6,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-26 19:59-0400\n" -"PO-Revision-Date: 2015-10-26 08:17+0200\n" +"PO-Revision-Date: 2015-10-27 08:28+0200\n" "Last-Translator: Kristjan Räts \n" -"Language-Team: Estonian \n" +"Language-Team: Estonian " +"\n" "Language: et\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -14366,6 +14366,8 @@ msgid "" "Username and hostname didn't change. If you only want to change the " "password, 'Change password' tab should be used." msgstr "" +"Kasutaja ja hosti nimesid ei muudetud. Kui sa soovid muuta ainult salasõna, " +"siis peaksid kasutama kaarti \"Salasõna vahetus\"." #: server_status.php:39 msgid "Not enough privilege to view server status." From 5264982990f3341eb30dcac0801af86617b4b418 Mon Sep 17 00:00:00 2001 From: dingo thirteen Date: Fri, 23 Oct 2015 17:00:54 +0200 Subject: [PATCH 3/4] Translated using Weblate (Dutch) Currently translated at 100.0% (3211 of 3211 strings) [CI skip] --- po/nl.po | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/po/nl.po b/po/nl.po index b5584cacc3..78a7b0e362 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4,10 +4,10 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.5.2-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-10-26 19:59-0400\n" -"PO-Revision-Date: 2015-10-23 17:00+0200\n" +"PO-Revision-Date: 2015-10-27 09:00+0200\n" "Last-Translator: dingo thirteen \n" -"Language-Team: Dutch \n" +"Language-Team: Dutch " +"\n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -14633,6 +14633,8 @@ msgid "" "Username and hostname didn't change. If you only want to change the " "password, 'Change password' tab should be used." msgstr "" +"Gebruikersnaam en servernaam zijn ongewijzigd. Als u alleen het wachtwoord " +"wil wijzigen, gebruik de 'Wijzig wachtwoord' tab." #: server_status.php:39 msgid "Not enough privilege to view server status." From ac97a97cb8896fedbcf04c609926d23b281e0075 Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Tue, 27 Oct 2015 19:45:39 +1100 Subject: [PATCH 4/4] Fix #11610, #11611 Signed-off-by: Madhura Jayaratne --- ChangeLog | 2 ++ .../plugins/schema/pdf/Pdf_Relation_Schema.class.php | 10 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f04c7915b..5dfdff2b26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ phpMyAdmin - ChangeLog - issue #11597 Huge binary log growth on 4.5.x - issue #11594 'only_db' config option bug when db names contain underscore and are grouped - issue #11607 Unable to change password from Login information tab +- issue #11610 Undefined variable: res_rel +- issue #11611 Warning while exporting schema to PDF 4.5.1.0 (2015-10-23) - issue Invalid argument supplied for foreach() diff --git a/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php b/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php index f0ecde580d..9f48425a97 100644 --- a/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php +++ b/libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php @@ -951,12 +951,10 @@ class PMA_Pdf_Relation_Schema extends PMA_Export_Relation_Schema * Gets fields properties */ $columns = $GLOBALS['dbi']->getColumns($this->db, $table); - // Check if we can use Relations - if (!empty($cfgRelation['relation'])) { - // Find which tables are related with the current one and write it in - // an array - $res_rel = PMA_getForeigners($this->db, $table); - } // end if + + // Find which tables are related with the current one and write it in + // an array + $res_rel = PMA_getForeigners($this->db, $table); /** * Displays the comments of the table if MySQL >= 3.23