- updated to 2.11.6

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

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index cd33685800d170d32fc7d4d8ff0b2e37a315fefe..ca57f72195ec55de4c094a38a155687a8071f9a5 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,22 +1,19 @@
---- 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
-@@ -2,7 +2,7 @@
+--- phpMyAdmin-2.11.0-all-languages.orig/libraries/config.default.php  2007-08-22 20:04:58.000000000 +0200
++++ phpMyAdmin-2.11.0-all-languages/libraries/config.default.php       2007-08-22 20:05:57.000000000 +0200
+@@ -141,14 +141,14 @@
+  *
+  * @global string $cfg['Servers'][$i]['auth_type']
+  */
+-$cfg['Servers'][$i]['auth_type'] = 'config';
++$cfg['Servers'][$i]['auth_type'] = 'cookie';
  
- /* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
- 
--/* $Id$ */
-+/* $Id$ */
- // vim: expandtab sw=4 ts=4 sts=4:
+ /**
+  * MySQL user
+  *
+  * @global string $cfg['Servers'][$i]['user']
+  */
+-$cfg['Servers'][$i]['user'] = 'root';
++$cfg['Servers'][$i]['user'] = 'mysql';
  
  /**
-@@ -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]['user']          = 'root';      // MySQL user
-+$cfg['Servers'][$i]['auth_type']     = 'cookie';    // Authentication method (config, http or cookie based)?
-+$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
+  * MySQL password (only needed with 'config' auth_type)