- updated to 5.1.1

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

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index 9809a01d0080d1b2d3b0ff153e68aaa11583ddb6..10ac2dfc7e2950adab66cf88ecc86afe29fb9030 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,9 +1,8 @@
-diff -ur phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php phpMyAdmin-5.0.2-all-languages/libraries/config.default.php
---- phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php   2020-03-21 05:17:40.000000000 +0100
-+++ phpMyAdmin-5.0.2-all-languages/libraries/config.default.php        2020-08-06 21:01:31.057763731 +0200
-@@ -1,18 +1,6 @@
+diff -ur phpMyAdmin-5.1.1-all-languages.orig/libraries/config.default.php phpMyAdmin-5.1.1-all-languages/libraries/config.default.php
+--- phpMyAdmin-5.1.1-all-languages.orig/libraries/config.default.php   2021-11-25 02:55:24.392642991 +0100
++++ phpMyAdmin-5.1.1-all-languages/libraries/config.default.php        2021-11-25 02:56:22.546780860 +0100
+@@ -1,18 +1,5 @@
  <?php
- /* vim: set expandtab sw=4 ts=4 sts=4: */
  /**
 - * <code>
 - * N   N  OOO  !!   DDDD   OOO    N   N  OOO  TTTTT   EEEE DDDD  I TTTTT !!
@@ -17,10 +16,11 @@ diff -ur phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php phpMyA
 - *
 - * phpMyAdmin default configuration, you can copy values from here to your
 - * config.inc.php
-  *
+- *
   * All directives are explained in the documentation
-  *
-@@ -880,14 +868,14 @@
+  */
+ 
+@@ -938,14 +925,14 @@
   *
   * @global integer $cfg['MaxNavigationItems']
   */
@@ -37,7 +37,7 @@ diff -ur phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php phpMyA
  
  /**
   * the separator to sub-tree the select-based light menu tree
-@@ -946,14 +934,14 @@
+@@ -1004,14 +991,14 @@
   *
   * @global integer $cfg['NumRecentTables']
   */
@@ -54,7 +54,7 @@ diff -ur phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php phpMyA
  
  /**
   * display a JavaScript table filter in the navigation panel
-@@ -1219,7 +1207,7 @@
+@@ -1277,7 +1264,7 @@
   *
   * @global string $cfg['GridEditing']
   */
@@ -63,7 +63,7 @@ diff -ur phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php phpMyA
  
  /**
   * Options > Relational display
-@@ -1369,7 +1357,7 @@
+@@ -1426,7 +1413,7 @@
   *
   * @global boolean $cfg['ActionLinksMode']
   */
@@ -72,7 +72,7 @@ diff -ur phpMyAdmin-5.0.2-all-languages.orig/libraries/config.default.php phpMyA
  
  /**
   * How many columns should be used for table display of a database?
-@@ -1419,7 +1407,7 @@
+@@ -1476,7 +1463,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``.
   */