- up for 2.10.0

Changed files:
    phpMyAdmin-config.patch -> 1.12

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index 111c966bb8e80afade967ae8ef95f5154496cc69..cbf77494a8a968943e812b05826495fcba5272cb 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,7 +1,7 @@
---- libraries/config.default.php       2007-01-10 03:24:01.000000000 +0100
-+++ libraries/config.default.php-new   2007-01-10 03:25:52.000000000 +0100
-@@ -2,7 +2,7 @@
- 
+--- libraries/config.default.php.orig  2007-02-28 01:51:14.000000000 +0100
++++ libraries/config.default.php       2007-02-28 05:46:58.000000000 +0100
+@@ -1,7 +1,7 @@
+ <?php
  /* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
  
 -/* $Id$ */
@@ -13,10 +13,10 @@
                                                      // The controluser is also
                                                      // used for all relational
                                                      // features (pmadb)
--$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (valid choices: config, http, HTTP or cookie)
+-$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (valid choices: config, http, HTTP, signon or cookie)
 -$cfg['Servers'][$i]['user']          = 'root';      // MySQL user
-+$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (valid choices: config, http, HTTP or cookie)
++$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (valid choices: config, http, HTTP, signon or cookie)
 +$cfg['Servers'][$i]['user']          = 'mysql';      // MySQL user
  $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
                                                      // with 'config' auth_type)
- $cfg['Servers'][$i]['nopassword']    = FALSE;       // Whether to try to connect without password
+ $cfg['Servers'][$i]['SignonSession'] = '';          // Session to use for 'signon' auth method