X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=phpMyAdmin-config.patch;h=110be5ae2c8c515be73bf507177629cebe3eca66;hb=refs%2Fheads%2Fmaster;hp=f21e488350905b83d69fa21db3bb14a39fd75c94;hpb=9ee679233e9da43e855b79605831440bdb09065e;p=packages%2FphpMyAdmin.git

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index f21e488..110be5a 100644
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,24 +1,12 @@
-diff -ur phpMyAdmin.orig/libraries/config.default.php phpMyAdmin/libraries/config.default.php
---- phpMyAdmin.orig/libraries/config.default.php	2005-11-23 11:34:32.000000000 +0100
-+++ phpMyAdmin/libraries/config.default.php	2005-12-19 21:02:34.565280520 +0100
-@@ -1,8 +1,6 @@
- <?php
- 
--/* !!! DO NOT EDIT THIS FILE, EDIT config.inc.php INSTEAD !!! */
--
--/* $Id$ */
-+/* $Id$ */
- // vim: expandtab sw=4 ts=4 sts=4:
+diff -burNp phpMyAdmin-3.1.0-all-languages/libraries/config.default.php phpMyAdmin-3.1.0-all-languages-new/libraries/config.default.php
+--- phpMyAdmin-3.1.0-all-languages/libraries/config.default.php	2008-11-28 14:21:00.000000000 +0100
++++ phpMyAdmin-3.1.0-all-languages-new/libraries/config.default.php	2008-12-02 10:31:40.200149063 +0100
+@@ -180,7 +180,7 @@ $cfg['Servers'][$i]['auth_swekey_config'
+  *
+  * @global string $cfg['Servers'][$i]['user']
+  */
+-$cfg['Servers'][$i]['user'] = 'root';
++$cfg['Servers'][$i]['user'] = 'mysql';
  
  /**
-@@ -68,8 +66,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]['only_db']       = '';          // If set to a db-name, only
+  * MySQL password (only needed with 'config' auth_type)