Merge branch 'MAINT_4_1_12' into STABLE

ChangeLog

@@ -1,6 +1,12 @@
 phpMyAdmin - ChangeLog
 ======================
 
+4.1.12.0 (2014-03-27)
+- bug #4334 Add event : datepicker won't open
+- bug #4338 Fix missing value error while executing SQL query
+- TCPDF library is now optional dependency
+- bug #4326 Cannot find the import plugins which start with uppercase 'I'
+
 4.1.11.0 (2014-03-23)
 - bug #4335 reCaptcha problem (4.1.10 regression) 
 

README

@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.1.11
+Version 4.1.12
 
 A set of PHP-scripts to manage MySQL over the web.
 

doc/conf.py

@@ -49,7 +49,7 @@
 # built documents.
 #
 # The short X.Y version.
-version = '4.1.11'
+version = '4.1.12'
 # The full version, including alpha/beta/rc tags.
 release = version
 

js/functions.js

@@ -385,7 +385,9 @@ function checkSqlQuery(theForm)
 {
     // get the textarea element containing the query
     if (codemirror_editor) {
+        codemirror_editor.save();
         var sqlQuery = codemirror_editor.display.input;
+        sqlQuery.value = codemirror_editor.getValue();
     } else {
         var sqlQuery = theForm.elements['sql_query'];
     }
@@ -1398,6 +1400,7 @@ AJAX.registerOnload('functions.js', function () {
         //hide already existing success message
         var sql_query;
         if (codemirror_inline_editor) {
+            codemirror_inline_editor.save();
             sql_query = codemirror_inline_editor.getValue();
         } else {
             sql_query = $(this).prev().val();

libraries/Config.class.php

@@ -114,7 +114,7 @@ function __construct($source = null)
      */
     function checkSystem()
     {
-        $this->set('PMA_VERSION', '4.1.11');
+        $this->set('PMA_VERSION', '4.1.12');
         /**
          * @deprecated
          */

libraries/plugin_interface.lib.php

@@ -58,8 +58,8 @@ function PMA_getPlugins($plugin_type, $plugins_dir, $plugin_param)
             // (for example ._csv.php) so the following regexp
             // matches a file which does not start with a dot but ends
             // with ".php"
-            $class_type = strtoupper($plugin_type[0])
-                . strtolower(substr($plugin_type, 1));
+            $class_type = mb_strtoupper($plugin_type[0], 'UTF-8')
+                . mb_strtolower(substr($plugin_type, 1), 'UTF-8');
             if (is_file($plugins_dir . $file)
                 && preg_match(
                     '@^' . $class_type . '(.+)\.class\.php$@i',

libraries/plugins/export/ExportPdf.class.php

@@ -10,6 +10,14 @@
     exit;
 }
 
+/**
+ * Skip the plugin if TCPDF is not available.
+ */
+if (! file_exists(TCPDF_INC)) {
+    $GLOBALS['skip_import'] = true;
+    return;
+}
+
 /* Get the export interface */
 require_once 'libraries/plugins/ExportPlugin.class.php';
 /* Get the PMA_ExportPdf class */
@@ -265,4 +273,4 @@ private function _setPdfReportTitle($pdfReportTitle)
         $this->_pdfReportTitle = $pdfReportTitle;
     }
 }
-?>
+?>

libraries/rte/rte_footer.lib.php

@@ -31,7 +31,7 @@ function PMA_RTE_getFooterLinks($docu, $priv, $name)
     if (PMA_Util::currentUserHasPrivilege($priv, $db)) {
         $retval .= "            <a {$ajax_class['add']} ";
         $retval .= "href='db_" . strtolower($name) . "s.php";
-        $retval .= "?$url_query&amp;add_item=1'>";
+        $retval .= "?$url_query&amp;add_item=1' onclick='$.datepicker.initialized = false;'>";
         $retval .= PMA_Util::getIcon($icon);
         $retval .= PMA_RTE_getWord('add') . "</a>\n";
     } else {

libraries/schema/Pdf_Relation_Schema.class.php

@@ -9,6 +9,14 @@
     exit;
 }
 
+/**
+ * Skip the plugin if TCPDF is not available.
+ */
+if (! file_exists(TCPDF_INC)) {
+    $GLOBALS['skip_import'] = true;
+    return;
+}
+
 /**
  * block attempts to directly run this script
  */

libraries/schema/User_Schema.class.php

@@ -419,12 +419,19 @@ public function displaySchemaGenerationOptions()
             $htmlString .= PMA_Util::getImage('b_views.png');
         }
 
+        /*
+         * TODO: This list should be generated dynamically based on list of
+         * available plugins.
+         */
         $htmlString .= __('Display relational schema')
             . ':'
             . '</legend>'
-            . '<select name="export_type" id="export_type">'
-            . '<option value="pdf" selected="selected">PDF</option>'
-            . '<option value="svg">SVG</option>'
+            . '<select name="export_type" id="export_type">';
+        if (file_exists(TCPDF_INC)) {
+            $htmlString .= '<option value="pdf" selected="selected">PDF</option>';
+        }
+        $htmlString .=
+            '<option value="svg">SVG</option>'
             . '<option value="dia">DIA</option>'
             . '<option value="eps">EPS</option>'
             . '</select>'
@@ -663,7 +670,15 @@ private function _processExportSchema()
                 __('File doesn\'t exist')
             );
         }
+        $GLOBALS['skip_import'] = false;
         include $filename;
+        if ( $GLOBALS['skip_import']) {
+            PMA_Export_Relation_Schema::dieSchema(
+                $_POST['chpage'],
+                $export_type,
+                __('Plugin is disabled')
+            );
+        }
         $class_name = 'PMA_' . $path . '_Relation_Schema';
         $obj_schema = new $class_name();
         $obj_schema->showOutput();

po/bg.po

@@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-03-15 10:29+0200\n"
-"Last-Translator: Pl <plamen_mbx@yahoo.com>\n"
-"Language-Team: Bulgarian "
-"<https://l10n.cihar.com/projects/phpmyadmin/4-1/bg/>\n"
+"PO-Revision-Date: 2014-03-26 11:54+0200\n"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"Language-Team: Bulgarian <https://l10n.cihar.com/projects/phpmyadmin/4-1/bg/>"
+"\n"
 "Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -12546,7 +12546,7 @@ msgstr "FOREIGN KEY релация е добавена"
 #: pmd_relation_new.php:84
 #| msgid "Error: Relation not added."
 msgid "Error: Relational features are disabled!"
-msgstr "Грешка: Релацията е изключена."
+msgstr "Грешка: Релацията е изключена!"
 
 #: pmd_relation_new.php:100
 msgid "Internal relation added"

po/bn.po

@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-02-24 07:36+0200\n"
+"PO-Revision-Date: 2014-03-26 11:43+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Bengali <https://l10n.cihar.com/projects/phpmyadmin/4-1/bn/>\n"
 "Language: bn\n"
@@ -35,7 +35,7 @@ msgstr "ডাটাবেইজের মন্তব্য: "
 #: libraries/tbl_printview.lib.php:579
 #| msgid "Table comments"
 msgid "Table comments:"
-msgstr "টেবিলের মন্তব্য সমূহ"
+msgstr "টেবিলের মন্তব্য সমূহ:"
 
 #: db_datadict.php:168 libraries/Index.class.php:567
 #: libraries/TableSearch.class.php:185 libraries/TableSearch.class.php:1282
@@ -505,7 +505,7 @@ msgstr "জ্যামিতি %d:"
 #: gis_data_editor.php:208
 #| msgid "Point"
 msgid "Point:"
-msgstr "পয়েন্ট"
+msgstr "পয়েন্ট:"
 
 #: gis_data_editor.php:209 gis_data_editor.php:236 gis_data_editor.php:291
 #: gis_data_editor.php:364 js/messages.php:325

po/cs.po

@@ -6,9 +6,9 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-01-20 11:16+0200\n"
+"PO-Revision-Date: 2014-03-26 11:51+0200\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
-"Language-Team: Czech <http://l10n.cihar.com/projects/phpmyadmin/4-1/cs/>\n"
+"Language-Team: Czech <https://l10n.cihar.com/projects/phpmyadmin/4-1/cs/>\n"
 "Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -3108,25 +3108,25 @@ msgstr "Chyba"
 #, php-format
 msgid "%1$d row affected."
 msgid_plural "%1$d rows affected."
-msgstr[0] "Ovlivněn %1$d řádek."
-msgstr[1] "Ovlivněny %1$d řádky."
-msgstr[2] "Ovlivněno %1$d řádek."
+msgstr[0] "Byl ovlivněn %1$d řádek."
+msgstr[1] "Byly ovlivněny %1$d řádky."
+msgstr[2] "Bylo ovlivněno %1$d řádků."
 
 #: libraries/Message.class.php:273
 #, php-format
 msgid "%1$d row deleted."
 msgid_plural "%1$d rows deleted."
-msgstr[0] "Smazán %1$d řádek."
-msgstr[1] "Smazány %1$d řádky."
-msgstr[2] "Smazáno %1$d řádek."
+msgstr[0] "Byl smazán %1$d řádek."
+msgstr[1] "Byly smazány %1$d řádky."
+msgstr[2] "Bylo smazáno %1$d řádků."
 
 #: libraries/Message.class.php:292
 #, php-format
 msgid "%1$d row inserted."
 msgid_plural "%1$d rows inserted."
-msgstr[0] "Vložen %1$d řádek."
-msgstr[1] "Vloženy %1$d řádky."
-msgstr[2] "Vloženo %1$d řádek."
+msgstr[0] "Byl vložen %1$d řádek."
+msgstr[1] "Byly vloženy %1$d řádky."
+msgstr[2] "Bylo vloženo %1$d řádků."
 
 #: libraries/PDF.class.php:70 libraries/Util.class.php:2475
 #: libraries/browse_foreigners.lib.php:393
@@ -9526,7 +9526,7 @@ msgid "%d row affected by the last statement inside the procedure"
 msgid_plural "%d rows affected by the last statement inside the procedure"
 msgstr[0] "Posledním příkazem v proceduře byla ovlivněna %d řádka"
 msgstr[1] "Posledním příkazem v proceduře byly ovlivněny %d řádky"
-msgstr[2] "Posledním příkazem v proceduře bylo ovlivněno %d řádek"
+msgstr[2] "Posledním příkazem v proceduře bylo ovlivněno %d řádků"
 
 #: libraries/rte/rte_routines.lib.php:1528
 #: libraries/rte/rte_routines.lib.php:1536
@@ -11394,7 +11394,7 @@ msgstr "Počet řazení, které byly omezeny rozsahem."
 
 #: libraries/server_status_variables.lib.php:727
 msgid "The number of sorted rows."
-msgstr "Počet řazených řádek."
+msgstr "Počet seřazených řádek."
 
 #: libraries/server_status_variables.lib.php:730
 msgid "The number of sorts that were done by scanning the table."

po/ia.po

@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.1.6-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2014-01-19 08:19-0500\n"
-"PO-Revision-Date: 2014-03-17 09:48+0200\n"
+"PO-Revision-Date: 2014-03-25 11:53+0200\n"
 "Last-Translator: Giovanni Sora <g.sora@tiscali.it>\n"
 "Language-Team: Interlingua "
 "<https://l10n.cihar.com/projects/phpmyadmin/4-1/ia/>\n"
@@ -6777,7 +6777,7 @@ msgstr ""
 #: libraries/display_export.lib.php:376 libraries/display_export.lib.php:411
 #, php-format
 msgid "Save on server in the directory <b>%s</b>"
-msgstr ""
+msgstr "Salveguarda sur servitor in le directorio <b>%s</b>"
 
 #: libraries/display_export.lib.php:441
 msgid "File name template:"
@@ -6885,6 +6885,8 @@ msgid ""
 "A compressed file's name must end in <b>.[format].[compression]</b>. "
 "Example: <b>.sql.zip</b>"
 msgstr ""
+"Le nomine de un file comprimite debe terminar in "
+"<b>.[format].[compression]</b>. Exemplo:<b>.sql.zip</b>"
 
 #: libraries/display_import.lib.php:225
 msgid "File to Import:"
@@ -7869,7 +7871,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:675
 msgid "Move table to (database<b>.</b>table):"
-msgstr ""
+msgstr "Move le tabella in (database<b>.</b>table):"
 
 #: libraries/operations.lib.php:786
 msgid "Table options"
@@ -7889,7 +7891,7 @@ msgstr ""
 
 #: libraries/operations.lib.php:1007
 msgid "Copy table to (database<b>.</b>table):"
-msgstr ""
+msgstr "Copia le tabella in (database<b>.</b>table):"
 
 #: libraries/operations.lib.php:1062
 msgid "Switch to copied table"
@@ -8488,15 +8490,15 @@ msgstr ""
 #: libraries/plugins/import/ImportMediawiki.class.php:303
 #, php-format
 msgid "Invalid format of mediawiki input on line: <br />%s."
-msgstr ""
+msgstr "Invalide formato de ingresso de mediawiki al rango: <br />%s."
 
 #: libraries/plugins/import/ImportOds.class.php:89
 msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>"
-msgstr ""
+msgstr "Importa percentage como valores decimal <i>(ex. 12.00% to .12)</i>"
 
 #: libraries/plugins/import/ImportOds.class.php:95
 msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>"
-msgstr ""
+msgstr "Importa numerario <i>(ex. $5.00 to 5.00)</i>"
 
 #: libraries/plugins/import/ImportOds.class.php:173
 #: libraries/plugins/import/ImportXml.class.php:132
@@ -8540,7 +8542,7 @@ msgstr ""
 
 #: libraries/plugins/import/ImportSql.class.php:83
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
-msgstr ""
+msgstr "Non usa <code>AUTO_INCREMENT</code> pro valores de zero"
 
 #: libraries/plugins/import/ImportXml.class.php:54
 msgid "XML"
@@ -8721,7 +8723,7 @@ msgstr ""
 #: libraries/relation.lib.php:289
 msgid ""
 "Create the needed tables with the <code>examples/create_tables.sql</code>."
-msgstr ""
+msgstr "Crea le tabella necessari con <code>examples/create_tables.sql</code>."
 
 #: libraries/relation.lib.php:295
 msgid "Create a pma user and give access to these tables."
@@ -9090,6 +9092,7 @@ msgstr ""
 #: libraries/rte/rte_triggers.lib.php:147
 msgid "<b>One or more errors have occurred while processing your request:</b>"
 msgstr ""
+"<b>Uno o plure de errores ha occurrite quando on processava tu requesta:</b>"
 
 #: libraries/rte/rte_events.lib.php:228
 msgid "Edit event"