- updated to 4.8.0

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

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index ded76988fbd1e232414e8a1678fbd1504457e9f9..817e1cad55fe5df0c8a135573b157adbc1c21900 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,6 +1,6 @@
-diff -ur phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php phpMyAdmin-4.5.3.1-all-languages/libraries/config.default.php
---- phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php 2015-12-25 20:07:18.000000000 +0000
-+++ phpMyAdmin-4.5.3.1-all-languages/libraries/config.default.php      2016-01-19 12:55:24.778367491 +0000
+diff -ur phpMyAdmin-4.8.0-all-languages.orig/libraries/config.default.php phpMyAdmin-4.8.0-all-languages/libraries/config.default.php
+--- phpMyAdmin-4.8.0-all-languages.orig/libraries/config.default.php   2018-04-07 14:55:43.000000000 +0000
++++ phpMyAdmin-4.8.0-all-languages/libraries/config.default.php        2018-04-14 20:17:39.235327539 +0000
 @@ -1,18 +1,6 @@
  <?php
  /* vim: set expandtab sw=4 ts=4 sts=4: */
@@ -20,30 +20,7 @@ diff -ur phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php phpM
   *
   * All directives are explained in the documentation
   *
-@@ -118,6 +106,13 @@
- $i = 1;
- 
- /**
-+ * Display name
-+ *
-+ * @global string $cfg['Servers'][$i]['display']
-+ */
-+$cfg['Servers'][$i]['display'] = 'localhost';
-+
-+/**
-  * MySQL hostname or IP address
-  *
-  * @global string $cfg['Servers'][$i]['host']
-@@ -257,7 +252,7 @@
-  *
-  * @global string $cfg['Servers'][$i]['user']
-  */
--$cfg['Servers'][$i]['user'] = 'root';
-+$cfg['Servers'][$i]['user'] = 'mysql';
- 
- /**
-  * MySQL password (only needed with 'config' auth_type)
-@@ -874,14 +869,14 @@
+@@ -869,14 +864,14 @@
   *
   * @global integer $cfg['MaxNavigationItems']
   */
@@ -60,7 +37,7 @@ diff -ur phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php phpM
  
  /**
   * the separator to sub-tree the select-based light menu tree
-@@ -940,14 +935,14 @@
+@@ -935,14 +930,14 @@
   *
   * @global integer $cfg['NumRecentTables']
   */
@@ -77,7 +54,7 @@ diff -ur phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php phpM
  
  /**
   * display a JavaScript table filter in the navigation panel
-@@ -1186,7 +1181,7 @@
+@@ -1201,7 +1196,7 @@
   *
   * @global string $cfg['GridEditing']
   */
@@ -86,7 +63,7 @@ diff -ur phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php phpM
  
  /**
   * Options > Relational display
-@@ -1333,7 +1328,7 @@
+@@ -1348,7 +1343,7 @@
   *
   * @global boolean $cfg['ActionLinksMode']
   */
@@ -95,7 +72,7 @@ diff -ur phpMyAdmin-4.5.3.1-all-languages.orig/libraries/config.default.php phpM
  
  /**
   * How many columns should be used for table display of a database?
-@@ -1383,7 +1378,7 @@
+@@ -1398,7 +1393,7 @@
   * Whether to display image or text or both image and text in table row
   * action segment. Value can be either of ``image``, ``text`` or ``both``.
   */