[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2-4432-gcf3930d - Git

20 Jun 2011

The branch, master has been updated
       via  cf3930d29ff507a57a6aaa986a4a11391573f8a1 (commit)
      from  61329e5c87cc7062eff02a71ee08084a8f2b9a12 (commit)
- Log -----------------------------------------------------------------
commit cf3930d29ff507a57a6aaa986a4a11391573f8a1
Author: Marc Delisle marc@infomarc.info
Date:   Mon Jun 20 16:25:11 2011 -0400
Complete the code change for form renaming (rowsDeleteForm to resultsForm)
-----------------------------------------------------------------------
Summary of changes:
 js/sql.js                     |    6 +++---
 libraries/display_tbl.lib.php |    8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/js/sql.js b/js/sql.js
index 080a2e4..b89d48b 100644
--- a/js/sql.js
+++ b/js/sql.js
@@ -97,7 +97,7 @@ function appendInlineAnchor() {
             $cloned_tr.insertAfter($this_tr);
         });
-        $('#rowsDeleteForm').find('tbody').find('th').each(function() {
+        $('#resultsForm').find('tbody').find('th').each(function() {
             var $this_th = $(this);
             if ($this_th.attr('rowspan') == 4) {
                 $this_th.attr('rowspan', '5');
@@ -149,7 +149,7 @@ function appendInlineAnchor() {
             $this_td.after($cloned_anchor);
         });
-        $('#rowsDeleteForm').find('thead, tbody').find('th').each(function() {
+        $('#resultsForm').find('thead, tbody').find('th').each(function() {
             var $this_th = $(this);
             if ($this_th.attr('colspan') == 4) {
                 $this_th.attr('colspan', '5');
@@ -981,7 +981,7 @@ $(document).ready(function() {
                 }
             }
         })
-rowsDeleteForm
+
         /*
          * update the where_clause, remove the last appended ' AND '
          * */
diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php
index 16d3a9f..22aaf69 100644
--- a/libraries/display_tbl.lib.php
+++ b/libraries/display_tbl.lib.php
@@ -2287,11 +2287,11 @@ function PMA_displayTable(&$dt_result, &$the_disp_mode, $analyzed_sql)
         $checkall_url = 'sql.php' . PMA_generate_common_url($_url_params);
if ($_SESSION['tmp_user_values']['disp_direction'] == 'vertical') {
-            $checkall_params['onclick'] = 'if (setCheckboxes('rowsDeleteForm', true)) return false;';
-            $uncheckall_params['onclick'] = 'if (setCheckboxes('rowsDeleteForm', false)) return false;';
+            $checkall_params['onclick'] = 'if (setCheckboxes('resultsForm', true)) return false;';
+            $uncheckall_params['onclick'] = 'if (setCheckboxes('resultsForm', false)) return false;';
         } else {
-            $checkall_params['onclick'] = 'if (markAllRows('rowsDeleteForm')) return false;';
-            $uncheckall_params['onclick'] = 'if (unMarkAllRows('rowsDeleteForm')) return false;';
+            $checkall_params['onclick'] = 'if (markAllRows('resultsForm')) return false;';
+            $uncheckall_params['onclick'] = 'if (unMarkAllRows('resultsForm')) return false;';
         }
         $checkall_link = PMA_linkOrButton($checkall_url, __('Check All'), $checkall_params, false);
         $uncheckall_link = PMA_linkOrButton($uncheckall_url, __('Uncheck All'), $uncheckall_params, false);
hooks/post-receive
-- 
phpMyAdmin


    