From 170238ecb2f5ab1c5aab56520d53193c2813eede Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 1 Feb 2013 07:43:02 -0500 Subject: [PATCH 1/4] Escape table name in relational schema editing --- libraries/schema/User_Schema.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index 399341247f..fb1af6d5ff 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -526,7 +526,7 @@ class PMA_User_Schema $reset_draginit .= ' document.edcoord.elements["c_table_' . $i . '[x]"].value = "2"' . "\n"; $reset_draginit .= ' document.edcoord.elements["c_table_' . $i . '[y]"].value = "' . (15 * $i) . '"' . "\n"; - echo '
' . $temp_sh_page['table_name'] . ''; + echo '
' . htmlspecialchars($temp_sh_page['table_name']) . ''; if (isset($with_field_names)) { $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']); // if the table has been dropped from outside phpMyAdmin, From 84e8341abbd676188fa26e53a4eb597fb1a2be90 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Fri, 1 Feb 2013 07:49:33 -0500 Subject: [PATCH 2/4] Fix merge conflicts --- libraries/schema/User_Schema.class.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libraries/schema/User_Schema.class.php b/libraries/schema/User_Schema.class.php index b20498e1b7..3b0ef6d0f1 100644 --- a/libraries/schema/User_Schema.class.php +++ b/libraries/schema/User_Schema.class.php @@ -568,7 +568,9 @@ class PMA_User_Schema . 'data-y="' . $drag_y . '" ' . 'class="pdflayout_table"' . '>' - . '' . $temp_sh_page['table_name'] . ''; + . '' + . htmlspecialchars($temp_sh_page['table_name']) + . ''; if (isset($with_field_names)) { $fields = PMA_DBI_get_columns($db, $temp_sh_page['table_name']); From 11eb7b7d92fda7dae4ba9c6572f562e10f118332 Mon Sep 17 00:00:00 2001 From: Andrey Prokopenko Date: Sat, 2 Feb 2013 11:47:27 +0100 Subject: [PATCH 3/4] Translated using Weblate (Russian) Currently translated at 100.0% (2598 of 2599) --- po/ru.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/po/ru.po b/po/ru.po index 1c8897a349..eed3b1f0ea 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-01-21 00:59+0100\n" -"PO-Revision-Date: 2013-01-26 08:30+0200\n" -"Last-Translator: Victor Volkov \n" +"PO-Revision-Date: 2013-02-02 11:47+0200\n" +"Last-Translator: Andrey Prokopenko \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -14,7 +14,7 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -"X-Generator: Weblate 1.4\n" +"X-Generator: Weblate 1.5-dev\n" #: browse_foreigners.php:36 browse_foreigners.php:60 js/messages.php:344 #: libraries/DisplayResults.class.php:809 @@ -9795,7 +9795,7 @@ msgid "None" msgstr "Нет" #: libraries/structure.lib.php:1329 -#, php-format +#, fuzzy, php-format msgid "Column %s has been dropped" msgstr "Поле %s было удалено" From 0c967a7ee6a9d563178f5368ec7f30aa869f3117 Mon Sep 17 00:00:00 2001 From: Victor Volkov Date: Sun, 3 Feb 2013 09:02:35 +0100 Subject: [PATCH 4/4] Translated using Weblate (Russian) Currently translated at 100.0% (2599 of 2599) --- po/ru.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/po/ru.po b/po/ru.po index eed3b1f0ea..2d5307f62a 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4,8 +4,8 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.0.0-dev\n" "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n" "POT-Creation-Date: 2013-01-21 00:59+0100\n" -"PO-Revision-Date: 2013-02-02 11:47+0200\n" -"Last-Translator: Andrey Prokopenko \n" +"PO-Revision-Date: 2013-02-03 09:02+0200\n" +"Last-Translator: Victor Volkov \n" "Language-Team: Russian " "\n" "Language: ru\n" @@ -9795,7 +9795,7 @@ msgid "None" msgstr "Нет" #: libraries/structure.lib.php:1329 -#, fuzzy, php-format +#, php-format msgid "Column %s has been dropped" msgstr "Поле %s было удалено"