Merge branch 'MAINT_3_3_2' into QA_3_3

This commit is contained in:
Michal Čihař
2010-04-08 12:33:35 +02:00

View File

@@ -1379,6 +1379,12 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
<abbr title="HyperText Transfer Protocol">HTTP</abbr> server is placed.
</dd>
<dt id ="cfg_Error_Handler_display">$cfg['Error_Handler']['display'] boolean</dt>
<dd>Whether to display errors from PHP or not.</dd>
<dt id ="cfg_Error_Handler_gather">$cfg['Error_Handler']['gather'] boolean</dt>
<dd>Whether to gather errors from PHP or not.</dd>
<dt id="cfg_LeftFrameLight">$cfg['LeftFrameLight'] boolean</dt>
<dd>Defines whether to use a select-based menu and display only the current
tables in the left frame (smaller page). Only in Non-Lightmode you can
@@ -1883,20 +1889,20 @@ $cfg['TrustedProxies'] =
name of the field. The comment is shown as a tool-tip for that field.
</dd>
<dt id ="cfb_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt>
<dt id ="cfg_SQLQuery_Edit">$cfg['SQLQuery']['Edit'] boolean</dt>
<dd>Whether to display an edit link to change a query in any SQL Query box.</dd>
<dt id ="cfb_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt>
<dt id ="cfg_SQLQuery_Explain">$cfg['SQLQuery']['Explain'] boolean</dt>
<dd>Whether to display a link to explain a SELECT query in any SQL Query box.</dd>
<dt id ="cfb_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt>
<dt id ="cfg_SQLQuery_ShowAsPHP">$cfg['SQLQuery']['ShowAsPHP'] boolean</dt>
<dd>Whether to display a link to wrap a query in PHP code in any SQL Query box.</dd>
<dt id ="cfb_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt>
<dt id ="cfg_SQLQuery_Validate">$cfg['SQLQuery']['Validate'] boolean</dt>
<dd>Whether to display a link to validate a query in any SQL Query box.
See also <tt><a href="#cfg_SQLValidator">$cfg_SQLValidator</a></tt>.</dd>
<dt id ="cfb_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt>
<dt id ="cfg_SQLQuery_Refresh">$cfg['SQLQuery']['Refresh'] boolean</dt>
<dd>Whether to display a link to refresh a query in any SQL Query box.</dd>
<dt id="cfg_UploadDir">$cfg['UploadDir'] string</dt>
@@ -4451,6 +4457,9 @@ now synchronize your databases placed on the same server or some remote server.
<abbr title="PHP Extension and Application Repository">PEAR</abbr>
coding standards</a>
on the other hand. Please pay attention to this.</li>
<li>Please enable showing PHP errors and warnings by the
<code><a href="#cfg_Error_Handler_display">$cfg['Error_Handler']['display']</a></code>
configuration directive.</li>
<li>Please try to keep up the file-naming conventions. Table-related stuff
goes to <i>tbl_*.php</i>, db-related code to <i>db_*.php</i>,
server-related tools to <i>server_*.php</i> and so on.</li>