Merge remote-tracking branch 'origin/master'

This commit is contained in:
Pootle server 2011-06-05 14:40:05 +02:00
commit dfb62b1a2c
4 changed files with 18 additions and 1 deletions

View File

@ -13,6 +13,7 @@
+ AJAX for Create table in navigation panel
+ rfe #3310562 Wording about Column
+ AJAX for Add a user in Database privileges
+ Patch #3271804 for rfe #3177495, new DisableMultiTableMaintenance directive
3.4.3.0 (not yet released)
- bug #3311170 [sync] Missing helper icons in Synchronize

View File

@ -1845,6 +1845,15 @@ $cfg['TrustedProxies'] =
Default is <code>1000</code>.
</dd>
<dt
id="cfg_DisableMultiTableMaintenance">$cfg['DisableMultiTableMaintenance'] boolean</dt>
<dd>
In the database Structure page, it's possible to mark some tables then
choose an operation like optimizing for many tables. This can slow down
a server; therefore, setting this to <code>true</code> prevents this kind
of multiple maintenance operation. Default is <code>false</code>.
</dd>
<dt id="cfg_NaviWidth">$cfg['NaviWidth'] integer</dt>
<dd>Navi frame width in pixels. See <tt>themes/themename/layout.inc.php</tt>.
</dd>

View File

@ -504,7 +504,7 @@ echo ' <option value="export" >'
echo ' <option value="print" >'
. __('Print view') . '</option>' . "\n";
if (!$db_is_information_schema) {
if (!$db_is_information_schema && !$cfg['DisableMultiTableMaintenance']) {
echo ' <option value="empty_tbl" >'
. __('Empty') . '</option>' . "\n";
echo ' <option value="drop_tbl" >'

View File

@ -2621,6 +2621,13 @@ $cfg['CheckConfigurationPermissions'] = true;
*/
$cfg['LinkLengthLimit'] = 2000;
/**
* Disable the table maintenance mass operations, like optimizing or
* repairing the selected tables of a database. An accidental execution
* of such a maintenance task can enormously slow down a bigger database.
*/
$cfg['DisableMultiTableMaintenance'] = false;
/*******************************************************************************
* SQL Parser Settings
*