[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_4_4-17325-g85037b0

[Marc Delisle]

The branch, master has been updated
       via  85037b0d6a434beed2a7d56eef5563067b64adfd (commit)
      from  270a5ab58683887f4ae4559087ac710e179b62a6 (commit)


- Log -----------------------------------------------------------------
commit 85037b0d6a434beed2a7d56eef5563067b64adfd
Author: Marc Delisle <marc at infomarc.info>
Date:   Sat Aug 27 13:21:55 2011 -0400

    Missing choice for InitialSlidersState

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

Summary of changes:
 libraries/config.default.php |    2 +-
 libraries/config.values.php  |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index 57ed7a7..ed3ea8b 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2423,7 +2423,7 @@ $cfg['NaturalOrder'] = true;
 
 /**
  * Initial state for sliders
- * (open | closed)
+ * (open | closed | disabled)
  *
  * @global string $cfg['InitialSlidersState']
  */
diff --git a/libraries/config.values.php b/libraries/config.values.php
index 7f81924..f4a7a49 100644
--- a/libraries/config.values.php
+++ b/libraries/config.values.php
@@ -72,7 +72,10 @@ $cfg_db['QueryWindowDefTab'] = array(
     'files',   // Import files
     'history', // SQL history
     'full');   // All (SQL and SQL history)
-$cfg_db['InitialSlidersState'] = array('open' => __('Open'), 'closed' => __('Closed'));
+$cfg_db['InitialSlidersState'] = array(
+    'open' => __('Open'), 
+    'closed' => __('Closed'),
+    'disabled' => __('Disabled'));
 $cfg_db['Import']['format'] = array(
     'csv',    // CSV
     'docsql', // DocSQL


hooks/post-receive
-- 
phpMyAdmin