[Phpmyadmin-git] [SCM] phpMyAdmin branch, master, updated. RELEASE_3_3_7-10162-g156c6d3

[Michal Čihař]

The branch, master has been updated
       via  156c6d31e8c33087d0eb710f9beead9cef54b8e9 (commit)
      from  1b187c909da32957ea046b85539c0da4c4982605 (commit)


- Log -----------------------------------------------------------------
commit 156c6d31e8c33087d0eb710f9beead9cef54b8e9
Author: Michal Čihař <mcihar at novell.com>
Date:   Thu Sep 16 15:48:48 2010 +0200

    Add LoginCookieValidity to user preferences (rfe #2100078).

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

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

diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php
index 7ae41fb..025c021 100644
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -25,6 +25,7 @@ $forms['Features']['General'] = array(
     'NaturalOrder',
     'InitialSlidersState',
     'ErrorIconic',
+    'LoginCookieValidity',
     'ReplaceHelpImg',
     'Servers/1/only_db', // saves to Server/only_db
     'Servers/1/hide_db', // saves to Server/hide_db
@@ -124,7 +125,7 @@ $forms['Main_frame']['Tabs'] = array(
     'DefaultTabTable');
 $forms['Import']['Import_defaults'] = array(
     'Import/format',
-    'Import/charset',    
+    'Import/charset',
     'Import/allow_interrupt',
     'Import/skip_queries');
 $forms['Import']['Sql'] = array(


hooks/post-receive
-- 
phpMyAdmin