The branch, master has been updated via 75d5afd40139f2d465df4a247c87f60cf7cffefc (commit) via 04c2f9d25444479ca4ddcbe83f58a06c13572fa4 (commit) from c24571f826c39dc7ff623d6392d0a49e7dfe02e3 (commit)
- Log ----------------------------------------------------------------- commit 75d5afd40139f2d465df4a247c87f60cf7cffefc Merge: c24571f826c39dc7ff623d6392d0a49e7dfe02e3 04c2f9d25444479ca4ddcbe83f58a06c13572fa4 Author: Marc Delisle marc@infomarc.info Date: Sat Aug 7 06:30:13 2010 -0400
merge conflict
-----------------------------------------------------------------------
Summary of changes: ChangeLog | 1 + libraries/sql_query_form.lib.php | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 43dc0d8..5f3291f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -113,6 +113,7 @@ $Id$ - bug #3036132 [core] Triggers not fetched if dbname has an hyphen - patch #3039269 [dbi] Wrong variable checked for nopassword option, thanks to Will Palmer - wpalmer +- bug #3040226 [XHTML] LockFromUpdate checkbox not checked by default
3.3.5.0 (2010-07-26) - patch #2932113 [information_schema] Slow export when having lots of diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 728c12c..d938699 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -355,7 +355,7 @@ function PMA_sqlQueryFormInsert($query = '', $is_querywindow = false, $delimiter ?> <script type="text/javascript"> //<![CDATA[ - document.writeln(' <input type="checkbox" name="LockFromUpdate" value="1" tabindex="120" id="checkbox_lock" /> <label for="checkbox_lock"><?php echo __('Do not overwrite this query from outside the window'); ?></label> '); + document.writeln(' <input type="checkbox" name="LockFromUpdate" checked="checked" tabindex="120" id="checkbox_lock" /> <label for="checkbox_lock"><?php echo __('Do not overwrite this query from outside the window'); ?></label> '); //]]> </script> <?php
hooks/post-receive
-
Marc Delisle