- updated for 2.9.2-rc1

[packages/phpMyAdmin.git] / phpMyAdmin-config.patch

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index d7446cb52ba662224d257738f66a88d938567486..111c966bb8e80afade967ae8ef95f5154496cc69 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,11 +1,22 @@
---- phpMyAdmin-2.5.5/config.inc.php~   2003-12-29 01:02:27.000000000 +0100
-+++ phpMyAdmin-2.5.5/config.inc.php    2003-12-29 01:02:55.000000000 +0100
-@@ -79,7 +79,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 @@
+ 
+ /* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
+ 
+-/* $Id$ */
++/* $Id$ */
+ // vim: expandtab sw=4 ts=4 sts=4:
+ 
+ /**
+@@ -68,8 +68,8 @@
                                                      // 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']     = 'cookie';    // Authentication method (config, http or cookie based)?
- $cfg['Servers'][$i]['user']          = 'root';      // MySQL user
+-$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 (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)
+ $cfg['Servers'][$i]['nopassword']    = FALSE;       // Whether to try to connect without password