[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_5RC1-18572-g9d4e9ef

[Madhura Jayaratne]

The branch, master has been updated
       via  9d4e9efe4bafbc60a82a02b1cc27d66f150dbc9d (commit)
       via  7e7e55b953b63b1f44bc64f636b564a5c754fcda (commit)
      from  68cb87a81829581e7457c4a8a6fe6b85ef663834 (commit)


- Log -----------------------------------------------------------------
commit 9d4e9efe4bafbc60a82a02b1cc27d66f150dbc9d
Merge: 68cb87a 7e7e55b
Author: Madhura Jayaratne <madhura.cj at gmail.com>
Date:   Sat Sep 10 08:47:35 2011 +0530

    Merge branch 'QA_3_4'

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

Summary of changes:
 ChangeLog                |    1 +
 libraries/common.lib.php |    6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01d1357..b76d296 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -51,6 +51,7 @@ phpMyAdmin - ChangeLog
 
 3.4.6.0 (not yet released)
 - patch #3404173 InnoDB comment display with tooltips/aliases
+- bug #3404886 [navi] Edit SQL statement after error
 
 3.4.5.0 (not yet released)
 - bug #3375325 [interface] Page list in navigation frame looks odd
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index dc7d152..b65405b 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -578,12 +578,12 @@ $is_modify_link = true, $back_url = '', $exit = true)
             if (strlen($table)) {
                 $_url_params['db'] = $db;
                 $_url_params['table'] = $table;
-                $doedit_goto = '<a href="tbl_sql.php?' . PMA_generate_common_url($_url_params) . '">';
+                $doedit_goto = '<a href="tbl_sql.php' . PMA_generate_common_url($_url_params) . '">';
             } elseif (strlen($db)) {
                 $_url_params['db'] = $db;
-                $doedit_goto = '<a href="db_sql.php?' . PMA_generate_common_url($_url_params) . '">';
+                $doedit_goto = '<a href="db_sql.php' . PMA_generate_common_url($_url_params) . '">';
             } else {
-                $doedit_goto = '<a href="server_sql.php?' . PMA_generate_common_url($_url_params) . '">';
+                $doedit_goto = '<a href="server_sql.php' . PMA_generate_common_url($_url_params) . '">';
             }
 
             $error_msg_output .= $doedit_goto


hooks/post-receive
-- 
phpMyAdmin