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

phpmyadmin · Jul 23, 2013 · ba487bb · ba487bb
2 parents 2401483 + 76ba0b0
commit ba487bb
Show file tree

Hide file tree

Showing 8 changed files with 13,057 additions and 25 deletions.
diff --git a/js/sql.js b/js/sql.js
@@ -364,7 +364,7 @@ AJAX.registerOnload('sql.js', function () {
     $("#resultsForm.ajax .mult_submit[value=edit]").live('click', function (event) {
         event.preventDefault();
 
-        /*Check whether atleast one row is selected for change*/
+        /*Check whether at least one row is selected*/
         if ($("#table_results tbody tr, #table_results tbody tr td").hasClass("marked")) {
             var $div = $('<div id="change_row_dialog"></div>');
 
@@ -426,6 +426,17 @@ AJAX.registerOnload('sql.js', function () {
         }
     });
 
+    /**
+     * Checks whether at least one row is selected for deletion or export
+     */
+    $("#resultsForm.ajax .mult_submit[value=delete]," +
+            "#resultsForm.ajax .mult_submit[value=export]").live('click', function (event) {
+        /*Check whether at least one row is selected*/
+        if (!$("#table_results tbody tr, #table_results tbody tr td").hasClass("marked")) {
+            event.preventDefault();
+            PMA_ajaxShowMessage(PMA_messages.strNoRowSelected);
+        }
+    });
 /**
  * Click action for "Go" button in ajax dialog insertForm -> insertRowTable
  */

diff --git a/js/tbl_zoom_plot_jqplot.js b/js/tbl_zoom_plot_jqplot.js
@@ -362,7 +362,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
                 // other
                 } else {
                     // type explicitly identified
-                    if (sqlTypes[key] !== null) {
+                    if (sqlTypes[key] != null) {
                         if (sqlTypes[key] == 'bit') {
                             sql_query += "b'" + value + "', ";
                         }
@@ -376,6 +376,7 @@ AJAX.registerOnload('tbl_zoom_plot_jqplot.js', function () {
                     }
                 }
             }
+            // remove two extraneous characters ', '
             sql_query = sql_query.substring(0, sql_query.length - 2);
             sql_query += ' WHERE ' + PMA_urldecode(searchedData[searchedDataKey].where_clause);
 

diff --git a/libraries/select_lang.lib.php b/libraries/select_lang.lib.php
@@ -340,6 +340,8 @@ function PMA_langDetails($lang)
         return array('uz[-_]lat|uzbek-latin', 'uz-lat', 'O&lsquo;zbekcha');
     case 'uz':
         return array('uz[-_]cyr|uzbek-cyrillic', 'uz-cyr', '&#1038;&#1079;&#1073;&#1077;&#1082;&#1095;&#1072;');
+    case 'vls':
+        return array('vls|flemish', 'vls', 'West-Vlams');
     case 'zh_TW':
         return array('zh[-_](tw|hk)|chinese traditional', 'zh-TW', '&#20013;&#25991;');
     case 'zh_CN':

diff --git a/libraries/sql.lib.php b/libraries/sql.lib.php
@@ -1028,6 +1028,9 @@ function PMA_addBookmark($pmaAbsoluteUri, $goto)
         exit;
     } else {
         // go back to sql.php to redisplay query; do not use &amp; in this case:
+        /**
+         * @todo In which scenario does this happen? 
+         */
         PMA_sendHeaderLocation(
             $pmaAbsoluteUri . $goto
             . '&label=' . $_POST['bkm_fields']['bkm_label']
@@ -2013,6 +2016,7 @@ function PMA_sendQueryResponseForResultsReturned($result, $justBrowsing,
     // value of a transformed field, show it here
     if (isset($_REQUEST['grid_edit']) && $_REQUEST['grid_edit'] == true) {
         PMA_sendResponseForGridEdit($result);
+        // script has exited at this point
     }
 
     // Gets the list of fields properties