- updated to 4.4.12

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

diff --git a/phpMyAdmin-config.patch b/phpMyAdmin-config.patch
index 8a9328f4dac02d75bc671c8d232f18f4b6abbd71..a2ba87b36f259fcfbba83f635306dcabba804983 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.4.12-all-languages.orig/libraries/config.default.php phpMyAdmin-4.4.12-all-languages/libraries/config.default.php
+--- phpMyAdmin-4.4.12-all-languages.orig/libraries/config.default.php  2015-07-20 12:55:42.000000000 +0000
++++ phpMyAdmin-4.4.12-all-languages/libraries/config.default.php       2015-07-25 15:38:01.668514288 +0000
 @@ -1,18 +1,6 @@
  <?php
  /* vim: set expandtab sw=4 ts=4 sts=4: */
@@ -42,7 +43,7 @@
  
  /**
   * MySQL password (only needed with 'config' auth_type)
-@@ -859,14 +854,14 @@
+@@ -853,14 +848,14 @@
   *
   * @global integer $cfg['MaxNavigationItems']
   */
@@ -59,7 +60,7 @@
  
  /**
   * the separator to sub-tree the select-based light menu tree
-@@ -918,14 +913,14 @@
+@@ -919,14 +914,14 @@
   *
   * @global integer $cfg['NumRecentTables']
   */
@@ -76,16 +77,16 @@
  
  /**
   * display a JavaScript table filter in the navigation panel
-@@ -1115,7 +1110,7 @@
+@@ -1124,7 +1119,7 @@
   *
   * @global string $cfg['GridEditing']
   */
 -$cfg['GridEditing'] ='double-click';
 +$cfg['GridEditing'] ='disabled';
  
- 
- /*******************************************************************************
-@@ -1244,7 +1239,7 @@
+ /**
+  * Options > Relational display
+@@ -1266,7 +1261,7 @@
   *
   * @global boolean $cfg['ActionLinksMode']
   */
@@ -94,7 +95,7 @@
  
  /**
   * How many columns should be used for table display of a database?
-@@ -1294,7 +1289,7 @@
+@@ -1316,7 +1311,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``.
   */