From: dongsheng <dongsheng>
Date: Mon, 30 Mar 2009 04:42:55 +0000 (+0000)
Subject: "MDL-18540, fixed default value of memorylimit"
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=c3935adbe71071520aa3b28f3571196c24e9425e;p=moodle.git

"MDL-18540, fixed default value of memorylimit"
---

diff --git a/admin/settings/server.php b/admin/settings/server.php
index 0a2819543e..d2b068dc7b 100644
--- a/admin/settings/server.php
+++ b/admin/settings/server.php
@@ -235,9 +235,10 @@ $ADMIN->add('server', new admin_externalpage('phpinfo', get_string('phpinfo'), "
 $temp = new admin_settingpage('performance', get_string('performance', 'admin'));
 
 $temp->add(new admin_setting_special_selectsetup('memorylimit', get_string('memorylimit', 'admin'),
-                                          get_string('configmemorylimit', 'admin'), '128M',
+                                          get_string('configmemorylimit', 'admin'), 0,
+                                          // if this option is set to 0, default 128M will be used
                                           array( '64M' => '64M',
-                                                 '128M' => '128M',
+                                                 '0' => '128M',
                                                  '256M' => '256M',
                                                  '1024M' => '1024M'
                                              )));