Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5

ChangeLog

@@ -98,6 +98,7 @@ phpMyAdmin - ChangeLog
 - issue #11436 CREATE DATABASE should be enabled by default on server exports
 - issue #11442 MySQL 5.7 and SHOW VARIABLES
 - issue #11445 MySQL 5.7 and Status page for an unprivileged user
+- issue #11448 Clarify doc about the MemoryLimit directive
 
 4.4.15.0 (not yet released)
 - issue #11411 Undefined "replace" function on numeric scalar

doc/config.rst

@@ -1263,10 +1263,12 @@ Generic settings
     :default: ``'-1'``
 
     Set the number of bytes a script is allowed to allocate. If set to
-    ``'-1'``, no limit is imposed.
+    ``'-1'``, no limit is imposed. If set to ``'0'``, no change of the
+    memory limit is attempted and the :file:`php.ini` ``memory_limit`` is
+    used.
 
-    This setting is used while importing/exporting dump files and at some other
-    places in phpMyAdmin so you definitely don't want to put here a too low
+    This setting is used while importing/exporting dump files
+    so you definitely don't want to put here a too low
     value. It has no effect when PHP is running in safe mode.
 
     You can also use any string as in :file:`php.ini`, eg. '16M'. Ensure you

libraries/config.default.php

@@ -720,7 +720,7 @@ $cfg['ExecTimeLimit'] = 300;
 $cfg['SessionSavePath'] = '';
 
 /**
- * maximum allocated bytes ('-1' for no limit)
+ * maximum allocated bytes ('-1' for no limit, '0' for no change)
  * this is a string because '16M' is a valid value; we must put here
  * a string as the default value so that /setup accepts strings
  *

libraries/config/messages.inc.php

@@ -463,7 +463,7 @@ $strConfigMaxTableList_desc = __(
 $strConfigMaxTableList_name = __('Maximum tables');
 $strConfigMemoryLimit_desc = __(
     'The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] '
-    . '([kbd]0[/kbd] for no limit).'
+    . '([kbd]-1[/kbd] for no limit and [kbd]0[/kbd] for no change).'
 );
 $strConfigMemoryLimit_name = __('Memory limit');
 $strConfigShowDatabasesNavigationAsTree_desc = __(