- updated to 5.0.2

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

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index 817e1cad55fe5df0c8a135573b157adbc1c21900..9809a01d0080d1b2d3b0ff153e68aaa11583ddb6 100644 (file)
--- a/phpMyAdmin-config.patch
+++ b/phpMyAdmin-config.patch
@@ -1,6 +1,6 @@
-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
+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 @@
  <?php
  /* vim: set expandtab sw=4 ts=4 sts=4: */
@@ -20,7 +20,7 @@ diff -ur phpMyAdmin-4.8.0-all-languages.orig/libraries/config.default.php phpMyA
   *
   * All directives are explained in the documentation
   *
-@@ -869,14 +864,14 @@
+@@ -880,14 +868,14 @@
   *
   * @global integer $cfg['MaxNavigationItems']
   */
@@ -37,7 +37,7 @@ diff -ur phpMyAdmin-4.8.0-all-languages.orig/libraries/config.default.php phpMyA
  
  /**
   * the separator to sub-tree the select-based light menu tree
-@@ -935,14 +930,14 @@
+@@ -946,14 +934,14 @@
   *
   * @global integer $cfg['NumRecentTables']
   */
@@ -54,16 +54,16 @@ diff -ur phpMyAdmin-4.8.0-all-languages.orig/libraries/config.default.php phpMyA
  
  /**
   * display a JavaScript table filter in the navigation panel
-@@ -1201,7 +1196,7 @@
+@@ -1219,7 +1207,7 @@
   *
   * @global string $cfg['GridEditing']
   */
--$cfg['GridEditing'] ='double-click';
-+$cfg['GridEditing'] ='disabled';
+-$cfg['GridEditing'] = 'double-click';
++$cfg['GridEditing'] = 'disabled';
  
  /**
   * Options > Relational display
-@@ -1348,7 +1343,7 @@
+@@ -1369,7 +1357,7 @@
   *
   * @global boolean $cfg['ActionLinksMode']
   */
@@ -72,7 +72,7 @@ diff -ur phpMyAdmin-4.8.0-all-languages.orig/libraries/config.default.php phpMyA
  
  /**
   * How many columns should be used for table display of a database?
-@@ -1398,7 +1393,7 @@
+@@ -1419,7 +1407,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``.
   */