[Phpmyadmin-git] [SCM] phpMyAdmin branch, MAINT_3_4_0, updated. RELEASE_3_4_0ALPHA1-532-gfff3afc

[Herman van Rink]

The branch, MAINT_3_4_0 has been updated
       via  fff3afc08e73b1fedafec2490f343bcb3dd541be (commit)
      from  268628e5ffe7ed2a74d912a43a6e53db186867c2 (commit)


- Log -----------------------------------------------------------------
commit fff3afc08e73b1fedafec2490f343bcb3dd541be
Author: Herman van Rink <rink at initfour.nl>
Date:   Fri Nov 26 20:55:58 2010 +0100

    bug #3115519: Prevent long queries from being shown in confirmation popup

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

Summary of changes:
 ChangeLog     |    1 +
 db_search.php |    2 +-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 994b4fa..d9e6a34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -120,6 +120,7 @@
 - bug #3087682 [interface] Do not apply LeftFrameDBSeparator on first character.
 + rfe #3111455 [interface] Column highlighting and marking in table view
 + Visual query builder
+- bug #3115519 [interface] Prevent long queries from being shown in confirmation popup
 
 3.3.9.0 (not yet released)
 - bug [doc] Fix references to MySQL doc
diff --git a/db_search.php b/db_search.php
index 6c87f61..10a9a13 100644
--- a/db_search.php
+++ b/db_search.php
@@ -257,7 +257,7 @@ if (isset($_REQUEST['submit_search'])) {
             $this_url_params['sql_query'] = $newsearchsqls['delete'];
             echo '<td>' . PMA_linkOrButton(
                     'sql.php' . PMA_generate_common_url($this_url_params),
-                    __('Delete'), $newsearchsqls['delete']) .  "</td>\n";
+                    __('Delete'), printf(__('Delete the matches for the "%s" table?'), htmlspecialchars($each_table))) .  "</td>\n";
 
         } else {
             echo '<td> </td>' . "\n"


hooks/post-receive
-- 
phpMyAdmin