"MDL-18540, fixed default value of memorylimit"

diff --git a/admin/settings/server.php b/admin/settings/server.php
index 0a2819543e478d08f491420ce7bca41c7e107f93..d2b068dc7b2904956f8ab5265a692c4b4bcf456a 100644 (file)
--- 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'
                                              )));