- packaged vendor dir too

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

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index 8a9328f4dac02d75bc671c8d232f18f4b6abbd71..817e1cad55fe5df0c8a135573b157adbc1c21900 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,5 +1,6 @@
---- phpMyAdmin-4.2.2-all-languages/libraries/config.default.php.orig   2014-05-20 12:33:33.000000000 +0000
-+++ phpMyAdmin-4.2.2-all-languages/libraries/config.default.php        2014-06-05 07:05:50.969396745 +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: */
@@ -19,30 +20,7 @@
   *
   * 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)
-@@ -859,14 +854,14 @@
+@@ -869,14 +864,14 @@
   *
   * @global integer $cfg['MaxNavigationItems']
   */
@@ -59,7 +37,7 @@
  
  /**
   * the separator to sub-tree the select-based light menu tree
-@@ -918,14 +913,14 @@
+@@ -935,14 +930,14 @@
   *
   * @global integer $cfg['NumRecentTables']
   */
@@ -76,16 +54,16 @@
  
  /**
   * display a JavaScript table filter in the navigation panel
-@@ -1115,7 +1110,7 @@
+@@ -1201,7 +1196,7 @@
   *
   * @global string $cfg['GridEditing']
   */
 -$cfg['GridEditing'] ='double-click';
 +$cfg['GridEditing'] ='disabled';
  
- 
- /*******************************************************************************
-@@ -1244,7 +1239,7 @@
+ /**
+  * Options > Relational display
+@@ -1348,7 +1343,7 @@
   *
   * @global boolean $cfg['ActionLinksMode']
   */
@@ -94,7 +72,7 @@
  
  /**
   * How many columns should be used for table display of a database?
-@@ -1294,7 +1289,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``.
   */