From 0f8ee2a630f2db90fe87f4b65c9c6715da7854a0 Mon Sep 17 00:00:00 2001 From: Fujiwara Software Date: Mon, 13 Feb 2017 11:26:01 +0000 Subject: [PATCH 1/5] Translated using Weblate (Japanese) Currently translated at 71.2% (2278 of 3199 strings) [CI skip] --- po/ja.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/po/ja.po b/po/ja.po index d9448f6bbd..16f3751177 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4,16 +4,16 @@ msgstr "" "Project-Id-Version: phpMyAdmin 4.7.0-dev\n" "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2017-01-25 10:08+0100\n" -"PO-Revision-Date: 2016-12-27 15:16+0000\n" +"PO-Revision-Date: 2017-02-13 11:25+0000\n" "Last-Translator: Fujiwara Software \n" -"Language-Team: Japanese \n" +"Language-Team: Japanese " +"\n" "Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 2.11-dev\n" +"X-Generator: Weblate 2.12-dev\n" #: changelog.php:39 license.php:34 #, fuzzy, php-format @@ -1807,7 +1807,7 @@ msgstr "エクスポート" #: js/messages.php:395 msgid "No routine is exportable. Required privileges may be lacking." -msgstr "" +msgstr "エクスポートできるルーチンがありません。この操作を実行する権限が無い可能性があります。" #: js/messages.php:398 libraries/rte/rte_routines.lib.php:747 msgid "ENUM/SET editor" From 8f611f05cfb2d7a6f8e098aa2e8d7705f88426c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 13 Feb 2017 13:50:41 +0100 Subject: [PATCH 2/5] Fixed rendering of foreign key browsing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #12985 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/browse_foreigners.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index c272e506b2..45a862badb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -66,6 +66,7 @@ phpMyAdmin - ChangeLog - issue #12981 Improved rendering of new version information - issue #12922 Fixed bookmarks ordering - issue #12964 Fixed table search in navigation +- issue #12985 Fixed rendering of foreign key browsing 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/libraries/browse_foreigners.lib.php b/libraries/browse_foreigners.lib.php index beea48c5ea..548713bee9 100644 --- a/libraries/browse_foreigners.lib.php +++ b/libraries/browse_foreigners.lib.php @@ -60,7 +60,7 @@ function PMA_getHtmlForOneKey($horizontal_count, $header, $keys, $leftKeynameIsSelected = $leftKeyname == $current_value; } - $output .= ''; $output .= PMA_getHtmlForColumnElement( 'class="nowrap"', $leftKeynameIsSelected, From 522c0598fa7106645ec4b3b448a7d3dc300ec920 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 13 Feb 2017 14:16:56 +0100 Subject: [PATCH 3/5] Sort column names as well MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes #12941 Signed-off-by: Michal Čihař --- templates/table/relation/foreign_key_row.phtml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/table/relation/foreign_key_row.phtml b/templates/table/relation/foreign_key_row.phtml index 274bbc7322..98b1bf6bce 100644 --- a/templates/table/relation/foreign_key_row.phtml +++ b/templates/table/relation/foreign_key_row.phtml @@ -43,6 +43,9 @@ foreach ($columns as $column) { $column_array[$column['Field']] = $column['Field']; } } +if ($GLOBALS['cfg']['NaturalOrder']) { + uksort($column_array, 'strnatcasecmp'); +} $foreign_table = false; // foreign database dropdown From a083a4c839987e49aac93901537b4ab5d98642f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 13 Feb 2017 14:43:05 +0100 Subject: [PATCH 4/5] Fixed manipulation with GIS data having zero coordinates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Another example when using PHP's empty() leads to problems. Fixes #12957 Signed-off-by: Michal Čihař --- ChangeLog | 1 + libraries/gis/GISGeometry.php | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45a862badb..48fffe7c07 100644 --- a/ChangeLog +++ b/ChangeLog @@ -67,6 +67,7 @@ phpMyAdmin - ChangeLog - issue #12922 Fixed bookmarks ordering - issue #12964 Fixed table search in navigation - issue #12985 Fixed rendering of foreign key browsing +- issue #12957 Fixed manipulation with GIS data having zero coordinates 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/libraries/gis/GISGeometry.php b/libraries/gis/GISGeometry.php index e84a405dae..a0f8cf6c16 100644 --- a/libraries/gis/GISGeometry.php +++ b/libraries/gis/GISGeometry.php @@ -222,7 +222,7 @@ abstract class GISGeometry // Extract coordinates of the point $cordinates = explode(" ", $point); - if (!empty($cordinates[0]) && trim($cordinates[0]) != '' + if (isset($cordinates[0]) && trim($cordinates[0]) != '' && isset($cordinates[1]) && trim($cordinates[1]) != '' ) { @@ -235,8 +235,8 @@ abstract class GISGeometry $y = floatval(trim($cordinates[1])); } } else { - $x = ''; - $y = ''; + $x = 0; + $y = 0; } if (!$linear) { From bca2e1c588626298c69a2b795cec84c223fce593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Mon, 13 Feb 2017 15:00:11 +0100 Subject: [PATCH 5/5] Use standard way for getting token value in designer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This way we share code with rest of phpMyAdmin, not building it again. Fixes #12804 Signed-off-by: Michal Čihař --- ChangeLog | 1 + js/console.js | 2 +- js/pmd/init.js | 3 +-- js/pmd/move.js | 22 ++++++++++----------- templates/database/designer/js_fields.phtml | 3 +-- 5 files changed, 15 insertions(+), 16 deletions(-) diff --git a/ChangeLog b/ChangeLog index 48fffe7c07..73087d2f72 100644 --- a/ChangeLog +++ b/ChangeLog @@ -68,6 +68,7 @@ phpMyAdmin - ChangeLog - issue #12964 Fixed table search in navigation - issue #12985 Fixed rendering of foreign key browsing - issue #12957 Fixed manipulation with GIS data having zero coordinates +- issue #12804 Fixed various designer javascript errors 4.6.6 (2017-01-23) - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup' diff --git a/js/console.js b/js/console.js index 8eb030b9f8..4101123ce1 100644 --- a/js/console.js +++ b/js/console.js @@ -193,8 +193,8 @@ var PMA_console = { var data = JSON.parse(xhr.responseText); PMA_console.ajaxCallback(data); } catch (e) { - console.log("Invalid JSON!" + e.message); console.trace(); + console.log("Invalid JSON!" + e.message); if (AJAX.xhr && AJAX.xhr.status === 0 && AJAX.xhr.statusText !== 'abort') { PMA_ajaxShowMessage($('
',{'class':'error','html':PMA_messages.strRequestFailed+' ( '+escapeHtml(AJAX.xhr.statusText)+' )'})); AJAX.active = false; diff --git a/js/pmd/init.js b/js/pmd/init.js index 47781256e4..bc4b1d680f 100644 --- a/js/pmd/init.js +++ b/js/pmd/init.js @@ -3,7 +3,7 @@ * Initialises the data required to run PMD, then fires it up. */ -var j_tabs, h_tabs, contr, display_field, server, db, token, selected_page, pmd_tables_enabled; +var j_tabs, h_tabs, contr, display_field, server, db, selected_page, pmd_tables_enabled; AJAX.registerTeardown('pmd/init.js', function () { $(".trigger").unbind('click'); @@ -25,7 +25,6 @@ AJAX.registerOnload('pmd/init.js', function () { server = $("#script_server").html(); db = $("#script_db").html(); - token = $("#script_token").html(); selected_page = $("#script_display_page").html() === "" ? "-1" : $("#script_display_page").html(); pmd_tables_enabled = $("#pmd_tables_enabled").html() === "1"; diff --git a/js/pmd/move.js b/js/pmd/move.js index 5c109f0eb6..e8bcc85c88 100644 --- a/js/pmd/move.js +++ b/js/pmd/move.js @@ -642,7 +642,7 @@ function Save2(callback) { if (pmd_tables_enabled) { var poststr = '&operation=savePage&save_page=same&ajax_request=true'; - poststr += '&server=' + server + '&db=' + db + '&token=' + token + '&selected_page=' + selected_page; + poststr += '&server=' + server + '&db=' + db + '&token=' + PMA_commonParams.get('token') + '&selected_page=' + selected_page; poststr += Get_url_pos(); var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest); @@ -729,7 +729,7 @@ function Save3(callback) var $form = $('
') .append('') .append('') - .append('') + .append('') .append('') .append('') .append('