merge conflict
This commit is contained in:
@@ -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
|
||||
|
@@ -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
|
||||
|
Reference in New Issue
Block a user