The branch, master has been updated via 932b5c2c36ae62d8b65c283d7da88c6b0c151bf2 (commit) via 14395afa8d5a1a9b34387698c5801ad5cac0ae98 (commit) from b47903e03fc2f103b10b59e9b988a4ced72e00f6 (commit)
- Log ----------------------------------------------------------------- commit 932b5c2c36ae62d8b65c283d7da88c6b0c151bf2 Author: Marc Delisle marc@infomarc.info Date: Mon Apr 18 12:30:59 2011 -0400
Improve variable name and formatting
commit 14395afa8d5a1a9b34387698c5801ad5cac0ae98 Author: onebighack onebighack@users.sourceforge.net Date: Mon Apr 18 12:27:37 2011 -0400
Patch #3276121 Inline link goes missing after table sort
-----------------------------------------------------------------------
Summary of changes: js/functions.js | 2 +- libraries/common.lib.php | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/js/functions.js b/js/functions.js index 502bf39..1016b2f 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1114,7 +1114,7 @@ function changeMIMEType(db, table, reference, mime_type) $(document).ready(function(){ var oldText,db,table,token,sql_query; oldText=$(".inner_sql").html(); - $("#inline_edit").click(function(){ + $("#inline_edit").live('click',function(){ db=$("input[name='db']").val(); table=$("input[name='table']").val(); token=$("input[name='token']").val(); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index ef8c637..8be5c0e 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1133,10 +1133,11 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view if (! empty($GLOBALS['validatequery'])) { $explain_params['validatequery'] = 1; } - + $is_select = false; if (preg_match('@^SELECT[[:space:]]+@i', $sql_query)) { $explain_params['sql_query'] = 'EXPLAIN ' . $sql_query; $_message = __('Explain SQL'); + $is_select = true; } elseif (preg_match('@^EXPLAIN[[:space:]]+SELECT[[:space:]]+@i', $sql_query)) { $explain_params['sql_query'] = substr($sql_query, 8); $_message = __('Skip Explain SQL'); @@ -1254,13 +1255,13 @@ 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 ($GLOBALS['is_ajax_request'] === false) { + // have two similar mechanisms on the page for the same goal + if ($is_select || $GLOBALS['is_ajax_request'] === false) { // 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" . "//<![CDATA[\n" . - "$('.tools').append('[<a href="#" title="" . + "$('.tools form').after('[<a href="#" title="" . PMA_escapeJsString(__('Inline edit of this query')) . "" id="inline_edit">" . PMA_escapeJsString(__('Inline')) .
hooks/post-receive