"MDL-18540, use admin_setting_configselect to set option"

diff --git a/admin/settings/server.php b/admin/settings/server.php
index d2b068dc7b2904956f8ab5265a692c4b4bcf456a..40d312caf55b76a4d9089d87ac1fc3dc798bd4b8 100644 (file)
--- a/admin/settings/server.php
+++ b/admin/settings/server.php
@@ -234,11 +234,11 @@ $ADMIN->add('server', new admin_externalpage('phpinfo', get_string('phpinfo'), "
 // "performance" settingpage
 $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'), 0,
+$temp->add(new admin_setting_configselect('memorylimit', get_string('memorylimit', 'admin'),
+                                          get_string('configmemorylimit', 'admin'), '128M',
                                           // if this option is set to 0, default 128M will be used
                                           array( '64M' => '64M',
-                                                 '0' => '128M',
+                                                 '128M' => '128M',
                                                  '256M' => '256M',
                                                  '1024M' => '1024M'
                                              )));

diff --git a/version.php b/version.php
index 72c04e92e26904a0a57a3128561c938e8f42c9cf..67967618710fe9515548713873afba2b54489cd7 100644 (file)
--- a/version.php
+++ b/version.php
@@ -6,7 +6,7 @@
 // This is compared against the values stored in the database to determine
 // whether upgrades should be performed (see lib/db/*.php)
 
-    $version = 2009032001;  // YYYYMMDD   = date of the last version bump
+    $version = 2009033001;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20090330)';  // Human-friendly version name