[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_2RC1-2985-g088e58b

Michal Čihař nijel at users.sourceforge.net
Mon Jun 6 11:21:46 CEST 2011


The branch, master has been updated
       via  088e58b023c80d59c41b336a7ae2ccf100a39614 (commit)
      from  cefdbde71ce9d5e871920d9e30cc88b2b19d19e9 (commit)


- Log -----------------------------------------------------------------
commit 088e58b023c80d59c41b336a7ae2ccf100a39614
Author: Michal Čihař <mcihar at novell.com>
Date:   Mon Jun 6 11:21:35 2011 +0200

    Configuration of DisableMultiTableMaintenance

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

Summary of changes:
 libraries/config/messages.inc.php           |    2 ++
 libraries/config/setup.forms.php            |    1 +
 libraries/config/user_preferences.forms.php |    1 +
 3 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php
index 1b8cbf3..5b144e1 100644
--- a/libraries/config/messages.inc.php
+++ b/libraries/config/messages.inc.php
@@ -57,6 +57,8 @@ $strConfigDisplayDatabasesList_desc = __('Show database listing as a list instea
 $strConfigDisplayDatabasesList_name = __('Display databases as a list');
 $strConfigDisplayServersList_desc = __('Show server listing as a list instead of a drop down');
 $strConfigDisplayServersList_name = __('Display servers as a list');
+$strConfigDisableMultiTableMaintenance_desc = __('Disable the table maintenance mass operations, like optimizing or repairing the selected tables of a database.');
+$strConfigDisableMultiTableMaintenance_name = __('Disable multi table maintenance');
 $strConfigEditInWindow_desc = __('Edit SQL queries in popup window');
 $strConfigEditInWindow_name = __('Edit in window');
 $strConfigError_Handler_display_name = __('Display errors');
diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php
index 0754091..8cb473d 100644
--- a/libraries/config/setup.forms.php
+++ b/libraries/config/setup.forms.php
@@ -135,6 +135,7 @@ $forms['Features']['Other_core_settings'] = array(
     'ExecTimeLimit',
     'MemoryLimit',
     'SkipLockedTables',
+    'DisableMultiTableMaintenance',
     'UseDbSearch',
     'AllowThirdPartyFraming');
 $forms['Sql_queries']['Sql_queries'] = array(
diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 003f508..38137ae 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -32,6 +32,7 @@ $forms['Features']['General'] = array(
     'Servers/1/only_db', // saves to Server/only_db
     'Servers/1/hide_db', // saves to Server/hide_db
     'SkipLockedTables',
+    'DisableMultiTableMaintenance',
     'MaxDbList',
     'MaxTableList');
 $forms['Features']['Text_fields'] = array(


hooks/post-receive
-- 
phpMyAdmin




More information about the Git mailing list