[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1477-gbb874ca

[Michal Čihař]

The branch, master has been updated
       via  bb874cabdee70fdf44ed0c757cf986c69f83b529 (commit)
       via  a6baca6d77bd67eb0f8fd7f355b112c9e11f350e (commit)
       via  1fc9371c6ca3551642b09d4ee2148df3fa89dc66 (commit)
      from  85ab22ddc0544c886fc33d1e291d3aa7a6e0edc8 (commit)


- Log -----------------------------------------------------------------
commit bb874cabdee70fdf44ed0c757cf986c69f83b529
Author: Michal Čihař <mcihar at novell.com>
Date:   Fri Jan 28 10:54:04 2011 +0100

    bug #3103658 Fix typo in generated code.

commit a6baca6d77bd67eb0f8fd7f355b112c9e11f350e
Author: Michal Čihař <mcihar at novell.com>
Date:   Fri Jan 28 10:52:04 2011 +0100

    Remove stray </div>

commit 1fc9371c6ca3551642b09d4ee2148df3fa89dc66
Author: Michal Čihař <mcihar at novell.com>
Date:   Fri Jan 28 10:49:20 2011 +0100

    input element can not be under tr
    
    Confirmation for DROP index did not work.

-----------------------------------------------------------------------

Summary of changes:
 js/functions.js                  |    2 +-
 js/tbl_structure.js              |    2 +-
 libraries/Index.class.php        |    7 +++----
 libraries/display_import.lib.php |    1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/js/functions.js b/js/functions.js
index bf10aaa..a13758e 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -2022,7 +2022,7 @@ $(document).ready(function() {
         button_options[PMA_messages['strCancel']] = function() {$(this).dialog('close').remove();}
 
         $.get($(this).attr('href'), {'ajax_request': true}, function(data) {
-            $('<div id="change_password_dialog></div>')
+            $('<div id="change_password_dialog"></div>')
             .dialog({
                 title: PMA_messages['strChangePassword'],
                 width: 600,
diff --git a/js/tbl_structure.js b/js/tbl_structure.js
index 6a7c773..2720b51 100644
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@@ -119,7 +119,7 @@ $(document).ready(function() {
          */
         var curr_row = $(this).parents('tr');
 
-        var question = $(curr_row).children('.drop_primary_key_index_msg').val();
+        var question = $(curr_row).children('td').children('.drop_primary_key_index_msg').val();
 
         $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
 
diff --git a/libraries/Index.class.php b/libraries/Index.class.php
index 53ea62d..6fc0bec 100644
--- a/libraries/Index.class.php
+++ b/libraries/Index.class.php
@@ -476,8 +476,9 @@ class PMA_Index
                     $js_msg      = PMA_jsFormat('ALTER TABLE ' . $table . ' DROP INDEX ' . $index->getName());
                 }
 
-                $r .= '<td ' . $row_span . '>'
-                    . '    <a ';
+                $r .= '<td ' . $row_span . '>';
+                $r .= '<input type="hidden" class="drop_primary_key_index_msg" value="' . $js_msg . '" />';
+                $r .= '    <a ';
                 if ($GLOBALS['cfg']['AjaxEnable']) {
                     $r .= 'class="drop_primary_key_index_anchor" ';
                 }
@@ -485,8 +486,6 @@ class PMA_Index
                    . '" >'
                    . PMA_getIcon('b_drop.png', __('Drop'))  . '</a>'
                    . '</td>' . "\n";
-
-                $r .= '<input type="hidden" class="drop_primary_key_index_msg" value="' . $js_msg . '" />';
             }
 
             $r .= '<th ' . $row_span . '>' . htmlspecialchars($index->getName()) . '</th>';
diff --git a/libraries/display_import.lib.php b/libraries/display_import.lib.php
index 76865f4..53a9351 100644
--- a/libraries/display_import.lib.php
+++ b/libraries/display_import.lib.php
@@ -267,4 +267,3 @@ if ($_SESSION[$SESSION_KEY]["handler"]!="noplugin") {
         <input type="submit" value="<?php echo __('Go'); ?>" id="buttonGo" />
     </div>
 </form>
-</div>


hooks/post-receive
-- 
phpMyAdmin