Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin

ChangeLog

@@ -96,6 +96,7 @@ phpMyAdmin - ChangeLog
 - issue #11407 ALTER TABLE failing on import when table exists
 
 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

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

js/functions.js

@@ -209,6 +209,7 @@ function PMA_tooltip($elements, item, myContent, additionalOptions)
 function escapeHtml(unsafe) {
     if (typeof(unsafe) != 'undefined') {
         return unsafe
+            .toString()
             .replace(/&/g, "&")
             .replace(/</g, "&lt;")
             .replace(/>/g, "&gt;")

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
  */

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: Παναγιώτης Παπάζογλου <papaz_p@yahoo.com>\n"
-"Language-Team: Greek <https://hosted.weblate.org/projects/phpmyadmin/master/"
-"el/>\n"
+"Language-Team: Greek "
+"<https://hosted.weblate.org/projects/phpmyadmin/master/el/>\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 ""

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%;
 }