From 1db012abc83f194b8423eca63a81a6715516dc30 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 2 Jul 2010 11:22:36 -0400
Subject: [PATCH 1/3] clarify code behavior

---
 js/common.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/js/common.js b/js/common.js
index 1d52c9770..8ba7bcd0f 100644
--- a/js/common.js
+++ b/js/common.js
@@ -101,10 +101,13 @@ function setDb(new_db) {
         var old_db = db;
         db = new_db;
 
+        // the db name as an id exists only when LeftFrameLight is false
         if (window.frame_navigation.document.getElementById(db) == null) {
+            // happens when LeftFrameLight is true
             // db is unknown, reload complete left frame
             refreshNavigation();
         } else {
+            // happens when LeftFrameLight is false
             unmarkDbTable(old_db);
             markDbTable(db);
         }

From 6ea94679499b0e48f6801d0b06c381556f2712c3 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 2 Jul 2010 12:26:54 -0400
Subject: [PATCH 2/3] bug #3024344 [setup] Setup forces numeric MemoryLimit

---
 ChangeLog                    | 1 +
 libraries/config.default.php | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eaa81ec8d..7c019b08e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   is no progress bar possible
 - bug [replication] Do not offer information_schema in the list of databases
 - bug [js] Avoid loading twice a js file
+- bug #3024344 [setup] Setup forces numeric MemoryLimit
 
 3.3.4.0 (2010-06-28)
 - bug #2996161 [import] properly escape import value
diff --git a/libraries/config.default.php b/libraries/config.default.php
index b1fef17ab..de03aa246 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -536,11 +536,13 @@ $cfg['ForceSSL'] = false;
 $cfg['ExecTimeLimit'] = 300;
 
 /**
- * maximum allocated bytes (0 for no limit)
+ * maximum allocated bytes ('0' for no limit)
+ * 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 
  *
- * @global integer $cfg['MemoryLimit']
+ * @global string $cfg['MemoryLimit']
  */
-$cfg['MemoryLimit'] = 0;
+$cfg['MemoryLimit'] = '0';
 
 /**
  * mark used tables, make possible to show locked tables (since MySQL 3.23.30)

From 43e41e0654c6d85e9311796631fddbf15f568cd3 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Fri, 2 Jul 2010 12:28:44 -0400
Subject: [PATCH 3/3] document MemoryLimit as being a string value

---
 Documentation.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation.html b/Documentation.html
index b930104ec..1afb49715 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -1300,7 +1300,7 @@ CREATE DATABASE,ALTER DATABASE,DROP DATABASE</pre>
         This setting is used while importing/exporting dump files and in the
         Synchronize feature but has no effect when PHP is running in safe mode.</dd>
 
-    <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] integer [number of bytes]</dt>
+    <dt id="cfg_MemoryLimit">$cfg['MemoryLimit'] string [number of bytes]</dt>
     <dd>Set the number of bytes a script is allowed to allocate. If set
         to zero, no limit is imposed.<br />
         This setting is used while importing/exporting dump files and at some