From 4b0cd53e75ea855562a0ffed547e13982add0290 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 23 Aug 2015 12:34:42 -0400 Subject: [PATCH 1/5] Add missing type check Fix parameter type Signed-off-by: Marc Delisle --- db_tracking.php | 2 +- libraries/tracking.lib.php | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/db_tracking.php b/db_tracking.php index a4a9258831..42db66199f 100644 --- a/db_tracking.php +++ b/db_tracking.php @@ -109,7 +109,7 @@ $all_tables_query = ' SELECT table_name, MAX(version) as version FROM ' . $all_tables_result = PMA_queryAsControlUser($all_tables_query); // If a HEAD version exists -if ($GLOBALS['dbi']->numRows($all_tables_result) > 0) { +if (is_object($all_tables_result) && $GLOBALS['dbi']->numRows($all_tables_result) > 0) { PMA_displayTrackedTables( $GLOBALS['db'], $all_tables_result, $url_query, $pmaThemeImage, $text_dir, $cfgRelation diff --git a/libraries/tracking.lib.php b/libraries/tracking.lib.php index 5fb845e344..dc839b0413 100644 --- a/libraries/tracking.lib.php +++ b/libraries/tracking.lib.php @@ -1588,12 +1588,12 @@ function PMA_getUntrackedTables($db) /** * Display tracked tables * - * @param string $db current database - * @param resource $all_tables_result result set of tracked tables - * @param string $url_query url query string - * @param string $pmaThemeImage path to theme's image folder - * @param string $text_dir text direction - * @param array $cfgRelation configuration storage info + * @param string $db current database + * @param object $all_tables_result result set of tracked tables + * @param string $url_query url query string + * @param string $pmaThemeImage path to theme's image folder + * @param string $text_dir text direction + * @param array $cfgRelation configuration storage info * * @return void */ From 2d9d60b5b482da28b73c547d3d6a47cebeb3a61d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=CE=A0=CE=B1=CE=BD=CE=B1=CE=B3=CE=B9=CF=8E=CF=84=CE=B7?= =?UTF-8?q?=CF=82=20=CE=A0=CE=B1=CF=80=CE=AC=CE=B6=CE=BF=CE=B3=CE=BB=CE=BF?= =?UTF-8?q?=CF=85?= Date: Sun, 23 Aug 2015 20:15:59 +0200 Subject: [PATCH 2/5] Translated using Weblate (Greek) Currently translated at 100.0% (3207 of 3207 strings) [CI skip] --- po/el.po | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/po/el.po b/po/el.po index 205cb3ea71..15995194b0 100644 --- a/po/el.po +++ b/po/el.po @@ -2,12 +2,12 @@ msgid "" msgstr "" "Project-Id-Version: phpMyAdmin 4.5.0-dev\n" -"Report-Msgid-Bugs-To: developers@phpmyadmin.net\n" +"Report-Msgid-Bugs-To: translators@phpmyadmin.net\n" "POT-Creation-Date: 2015-08-22 07:48-0400\n" -"PO-Revision-Date: 2015-08-19 13:01+0200\n" +"PO-Revision-Date: 2015-08-23 20:15+0200\n" "Last-Translator: Παναγιώτης Παπάζογλου \n" -"Language-Team: Greek \n" +"Language-Team: Greek " +"\n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -6034,6 +6034,8 @@ msgid "" "Add IF NOT EXISTS (less efficient as indexes will be generated during table " "creation)" msgstr "" +"Προσθήκη του IF NOT EXISTS (λιγότερο αποτελεσματικό από ευρετήρια καθώς θα " +"δημιουργηθούν κατά τη δημιουργία τη δημιουργία πίνακα)" #: libraries/config/messages.inc.php:210 msgid "Use ignore inserts" @@ -10598,12 +10600,14 @@ msgstr "Προσθήκη δηλώσεων:" #: libraries/plugins/export/ExportSql.class.php:277 msgid "(less efficient as indexes will be generated during table creation)" msgstr "" +"(λιγότερυ αποτελεσματικό από ευρετήρια καθώς θα δημιουργηθούν κατά τη " +"δημιουργία πίνακα)" #: libraries/plugins/export/ExportSql.class.php:282 -#, fuzzy, php-format +#, php-format #| msgid "Session value" msgid "%s value" -msgstr "Τιμή συνεδρίας" +msgstr "%s τιμή" #: libraries/plugins/export/ExportSql.class.php:322 msgid "" From 95c8f9fd841d4d96a54c30182864ae43be1e7173 Mon Sep 17 00:00:00 2001 From: Andrea Pezzino Date: Sun, 23 Aug 2015 15:13:43 -0400 Subject: [PATCH 3/5] Fixes #11411 Undefined "replace" function on numeric scalar Signed-off-by: Andrea Pezzino --- js/functions.js | 1 + 1 file changed, 1 insertion(+) diff --git a/js/functions.js b/js/functions.js index f4a9fd1466..d8f5eb61d9 100644 --- a/js/functions.js +++ b/js/functions.js @@ -144,6 +144,7 @@ function PMA_tooltip($elements, item, myContent, additionalOptions) function escapeHtml(unsafe) { if (typeof(unsafe) != 'undefined') { return unsafe + .toString() .replace(/&/g, "&") .replace(//g, ">") From 73261814fda58c20bc23514c7852eb76733a4d2a Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Sun, 23 Aug 2015 15:15:37 -0400 Subject: [PATCH 4/5] ChangeLog entry Signed-off-by: Marc Delisle --- ChangeLog | 1 + 1 file changed, 1 insertion(+) diff --git a/ChangeLog b/ChangeLog index afcf42b745..49fb7d33ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,7 @@ phpMyAdmin - ChangeLog ====================== 4.4.15.0 (not yet released) +- issue #11411 Undefined "replace" function on numeric scalar 4.4.14.0 (2015-08-20) - issue #11367 Export after search, missing WHERE clause From 2edb392efca65a4ca002ce1371d5a62f65eb84b9 Mon Sep 17 00:00:00 2001 From: Brad Kent Date: Sat, 22 Aug 2015 21:45:22 -0500 Subject: [PATCH 5/5] fix for routine radio and checkbox width fixes execute enum/set options and the "is deterministic" checkbox on edit Signed-off-by: Brad Kent --- themes/pmahomme/css/rte.css.php | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/themes/pmahomme/css/rte.css.php b/themes/pmahomme/css/rte.css.php index 0db21a805c..55d7832e9a 100644 --- a/themes/pmahomme/css/rte.css.php +++ b/themes/pmahomme/css/rte.css.php @@ -38,6 +38,12 @@ if (! defined('PMA_MINIMUM_COMMON') && ! defined('TESTSUITE')) { -webkit-box-sizing: border-box; } +.rte_table input[type=checkbox], +.rte_table input[type=radio] { + width: auto; + margin-right: 6px; +} + .rte_table .routine_params_table { width: 100%; }