From b46e6b5351e693f0c05590cef92e108709054085 Mon Sep 17 00:00:00 2001 From: Ahmed Saad Date: Tue, 3 Feb 2015 23:58:06 +0100 Subject: [PATCH 1/2] Translated using Weblate (Arabic) Currently translated at 37.3% (1112 of 2981 strings) [CI skip] --- po/ar.po | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/po/ar.po b/po/ar.po index 7e18472e70..c97da10727 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4,17 +4,17 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.3.5-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2015-01-01 08:24-0500\n" -"PO-Revision-Date: 2014-10-12 15:52+0200\n" -"Last-Translator: hassan mokhtari \n" -"Language-Team: Arabic \n" +"PO-Revision-Date: 2015-02-03 23:58+0200\n" +"Last-Translator: Ahmed Saad \n" +"Language-Team: Arabic " +"\n" "Language: ar\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n" -"X-Generator: Weblate 1.10-dev\n" +"X-Generator: Weblate 2.2-dev\n" #: changelog.php:36 license.php:28 #, php-format @@ -255,7 +255,7 @@ msgstr "تمت إعادة تسمية قاعدة البيانات %1$s إلى %2$ #, fuzzy, php-format #| msgid "Database %1$s has been copied to %2$s." msgid "Database %1$s has been copied to %2$s." -msgstr "تم نسخ قاعدة البيانات من %1$s إلى %2$s" +msgstr "تم نسخ قاعدة البيانات %1$s إلى %2$s" #: db_operations.php:266 #, fuzzy, php-format @@ -313,10 +313,9 @@ msgstr "آخر تحديث" #: db_printview.php:134 libraries/plugins/export/ExportSql.class.php:1170 #: libraries/plugins/schema/pdf/Pdf_Relation_Schema.class.php:1005 -#, fuzzy #| msgid "Last check" msgid "Last check:" -msgstr "آخر فحص" +msgstr "آخر فحص:" #: db_printview.php:146 libraries/structure.lib.php:169 #, php-format From 677da2906c800acf6da431c47cb766286e56864f Mon Sep 17 00:00:00 2001 From: Madhura Jayaratne Date: Wed, 4 Feb 2015 15:11:05 +0530 Subject: [PATCH 2/2] bug #4706 Schema export doesn't handle dots in db/table name Signed-off-by: Madhura Jayaratne --- ChangeLog | 1 + libraries/plugins/schema/Export_Relation_Schema.class.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 639f811579..838670d06f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ phpMyAdmin - ChangeLog - bug #4743 Unable to move cursor with keyboard in filter rows box - bug Incorrect link in doc - bug #4745 Tracking does not handle views properly +- bug #4706 Schema export doesn't handle dots in db/table name 4.3.8.0 (2015-01-24) - bug Undefined constant PMA_DRIZZLE diff --git a/libraries/plugins/schema/Export_Relation_Schema.class.php b/libraries/plugins/schema/Export_Relation_Schema.class.php index 7d7a7adeba..fc142290cf 100644 --- a/libraries/plugins/schema/Export_Relation_Schema.class.php +++ b/libraries/plugins/schema/Export_Relation_Schema.class.php @@ -240,9 +240,9 @@ class PMA_Export_Relation_Schema protected function getTablesFromRequest() { $tables = array(); + $dbLength = mb_strlen($GLOBALS['db']); foreach ($_REQUEST['t_h'] as $key => $value) { - list(, $table) = explode(".", $key); - $tables[] = $table; + $tables[] = mb_substr($key, $dbLength + 1); } return $tables; }