The branch, master has been updated via e2ffec079236176eeb56cbaeeb3e1984612d48bc (commit) via 27224a88c5cebcc9391d17b1cef4447c6be41c3b (commit) from fd1ac3cdac0a302ace44c966337822d7589a129c (commit)

- Log ----------------------------------------------------------------- commit e2ffec079236176eeb56cbaeeb3e1984612d48bc Merge: fd1ac3cdac0a302ace44c966337822d7589a129c 27224a88c5cebcc9391d17b1cef4447c6be41c3b Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sat May 7 11:18:35 2011 +0530

Merge branch 'QA_3_4'

commit 27224a88c5cebcc9391d17b1cef4447c6be41c3b Author: Madhura Jayaratne madhura.cj@gmail.com Date: Sat May 7 10:55:01 2011 +0530

Bug #3298581 - Row marking, null-checkbox of inline edit broken

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

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

diff --git a/js/functions.js b/js/functions.js index 52c3c28..572c857 100644 --- a/js/functions.js +++ b/js/functions.js @@ -1118,7 +1118,7 @@ function changeMIMEType(db, table, reference, mime_type) * Jquery Coding for inline editing SQL_QUERY */ $(document).ready(function(){ - $(".inline_edit").click( function(){ + $(".inline_edit_sql").click( function(){ var db = $(this).prev().find("input[name='db']").val(); var table = $(this).prev().find("input[name='table']").val(); var token = $(this).prev().find("input[name='token']").val(); diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 56618a1..5b353ec 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -663,7 +663,7 @@ function PMA_mysqlDie($error_message = '', $the_query = '', if ($exit) { /** * If in an Ajax request - * - avoid displaying a Back link + * - avoid displaying a Back link * - use PMA_ajaxResponse() to transmit the message and exit */ if($GLOBALS['is_ajax_request'] == true) { @@ -1255,7 +1255,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 + // 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() @@ -1263,7 +1263,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view "//<![CDATA[\n" . "$('.tools form').last().after('[<a href=\"#\" title=\"" . PMA_escapeJsString(__('Inline edit of this query')) . - "\" class=\"inline_edit\">" . + "\" class=\"inline_edit_sql\">" . PMA_escapeJsString(__('Inline')) . "</a>]');\n" . "//]]>\n" .

hooks/post-receive