[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_3_1-12843-g9fcb5e7

[Michal Čihař]

The branch, master has been updated
       via  9fcb5e7c8662e5f9a71babe684a9a87b37208a46 (commit)
       via  dff4e25c552e360ccbbbf5f11cad1294916be029 (commit)
      from  98cff52cf8d2022eea50eb62e239b4be6787c737 (commit)


- Log -----------------------------------------------------------------
commit 9fcb5e7c8662e5f9a71babe684a9a87b37208a46
Merge: 98cff52cf8d2022eea50eb62e239b4be6787c737 dff4e25c552e360ccbbbf5f11cad1294916be029
Author: Michal Čihař <mcihar at suse.cz>
Date:   Tue Aug 2 16:04:07 2011 +0200

    Merge branch 'fix-inlineedit' of git://github.com/csware/phpmyadmin into integration

commit dff4e25c552e360ccbbbf5f11cad1294916be029
Author: Sven Strickroth <email at cs-ware.de>
Date:   Mon Aug 1 15:05:18 2011 +0200

    inline editing a SQL query doesn't work if it's too long
    
    Signed-off-by: Sven Strickroth <email at cs-ware.de>

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

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

diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 61f5aa6..d812262 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1182,7 +1182,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
         // in the tools div, only display the Inline link when not in ajax
         // mode because 1) it currently does not work and 2) we would
         // have two similar mechanisms on the page for the same goal
-        if ($is_select || $GLOBALS['is_ajax_request'] === false) {
+        if ($is_select || $GLOBALS['is_ajax_request'] === false && ! $query_too_big) {
         // see in js/functions.js the jQuery code attached to id inline_edit
         // document.write conflicts with jQuery, hence used $().append()
             echo "<script type=\"text/javascript\">\n" .


hooks/post-receive
-- 
phpMyAdmin