- updated for 2.9.2-rc1

Changed files:
    phpMyAdmin-config.patch -> 1.10.2.1

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index cd33685800d170d32fc7d4d8ff0b2e37a315fefe..111c966bb8e80afade967ae8ef95f5154496cc69 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,5 +1,5 @@
---- libraries/config.default.php.orig  2006-11-19 01:28:45.000000000 +0100
-+++ libraries/config.default.php       2006-11-19 03:40:56.492681504 +0100
+--- 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 @@
  
  /* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
@@ -13,9 +13,9 @@
                                                      // The controluser is also
                                                      // used for all relational
                                                      // features (pmadb)
--$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (config, http or cookie based)?
+-$cfg['Servers'][$i]['auth_type']     = 'config';    // Authentication method (valid choices: config, http, HTTP or cookie)
 -$cfg['Servers'][$i]['user']          = 'root';      // MySQL user
-+$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
++$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (valid choices: config, http, HTTP or cookie)
 +$cfg['Servers'][$i]['user']          = 'mysql';      // MySQL user
  $cfg['Servers'][$i]['password']      = '';          // MySQL password (only needed
                                                      // with 'config' auth_type)