[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_0BETA2-1474-g85ab22d

[Michal Čihař]

The branch, master has been updated
       via  85ab22ddc0544c886fc33d1e291d3aa7a6e0edc8 (commit)
      from  701268fb5778e4031c6b79d910c068f05c14c79e (commit)


- Log -----------------------------------------------------------------
commit 85ab22ddc0544c886fc33d1e291d3aa7a6e0edc8
Author: Michal Čihař <mcihar at novell.com>
Date:   Fri Jan 28 10:40:23 2011 +0100

    input element can not be under tr
    
    This prevented the JS confirmation to work with Chromium, because it
    moved the element outside the table.

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

Summary of changes:
 js/db_structure.js            |    2 +-
 libraries/db_routines.inc.php |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/js/db_structure.js b/js/db_structure.js
index 03aa8e1..8b529d7 100644
--- a/js/db_structure.js
+++ b/js/db_structure.js
@@ -199,7 +199,7 @@ $(document).ready(function() {
         /**
          * @var question    String containing the question to be asked for confirmation
          */
-        var question = $(curr_proc_row).children('.drop_procedure_sql').val();
+        var question = $(curr_proc_row).children('td').children('.drop_procedure_sql').val();
 
         $(this).PMA_confirm(question, $(this).attr('href'), function(url) {
 
diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php
index 49819dd..d898d00 100644
--- a/libraries/db_routines.inc.php
+++ b/libraries/db_routines.inc.php
@@ -65,20 +65,19 @@ if ($routines) {
             $sqlDropProc = 'DROP FUNCTION ' . PMA_backquote($routine['SPECIFIC_NAME']);
         }
         echo sprintf('<tr class="%s">
-                          <td><strong>%s</strong></td>
+                          <td><input type="hidden" class="drop_procedure_sql" value="%s" /><strong>%s</strong></td>
                           <td>%s</td>
                           <td>%s</td>
                           <td>%s</td>
                           <td>%s</td>
-                          <input type="hidden" class="drop_procedure_sql" value="%s" />
                      </tr>',
                      ($ct%2 == 0) ? 'even' : 'odd',
+                     $sqlDropProc,
                      $routine['ROUTINE_NAME'],
                      ! empty($definition) ? PMA_linkOrButton('db_sql.php?' . $url_query . '&sql_query=' . urlencode($definition) . '&show_query=1&db_query_force=1&delimiter=' . urlencode($delimiter), $titles['Structure']) : ' ',
                      '<a class="drop_procedure_anchor" href="sql.php?' . $url_query . '&sql_query=' . urlencode($sqlDropProc) . '" >' . $titles['Drop'] . '</a>',
                      $routine['ROUTINE_TYPE'],
-                     $routine['DTD_IDENTIFIER'],
-                    $sqlDropProc);
+                     $routine['DTD_IDENTIFIER']);
         $ct++;
     }
     echo '</table>';


hooks/post-receive
-- 
phpMyAdmin