The branch, master has been updated via 049886139c62c3ed8b6573a0637ec5516857661f (commit) via 8e98c5dd038eef2b6a56ab13b0cd7d30d9c76498 (commit) from 6d459c02225a3b23914130c2752e870f31f53dc7 (commit)

- Log ----------------------------------------------------------------- commit 049886139c62c3ed8b6573a0637ec5516857661f Merge: 8e98c5dd038eef2b6a56ab13b0cd7d30d9c76498 6d459c02225a3b23914130c2752e870f31f53dc7 Author: Marc Delisle marc@infomarc.info Date: Thu Jul 22 08:48:21 2010 -0400

Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

commit 8e98c5dd038eef2b6a56ab13b0cd7d30d9c76498 Author: Marc Delisle marc@infomarc.info Date: Thu Jul 22 08:47:47 2010 -0400

bug #3030862 (master only) inline sql edit got undefined

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

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

diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 7e79faf..9e22f45 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -1277,6 +1277,17 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view if (! empty($refresh_link)) { PMA_profilingCheckbox($sql_query); } + // if needed, generate an invisible form that contains controls for the + // Inline link; this way, the behavior of the Inline link does not + // depend on the profiling support or on the refresh link + if (empty($refresh_link) || ! PMA_profilingSupported()) { + echo '<form action="sql.php" method="post">'; + echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); + echo '<input type="hidden" name="sql_query" value="' . htmlspecialchars($sql_query) . '" />'; + echo '</form>'; + } + + // see in js/functions.js the jQuery code attached to id inline_edit $inline_edit = "<script type="text/javascript">\n" . "//<![CDATA[\n" . "document.write('[<a href="#" title="" .

hooks/post-receive