"MDL-18540, change option name to extramemorylimit"

diff --git a/admin/settings/server.php b/admin/settings/server.php
index 40d312caf55b76a4d9089d87ac1fc3dc798bd4b8..c21dda541ffffc0f4816c2f8e74f585725cf7872 100644 (file)
--- a/admin/settings/server.php
+++ b/admin/settings/server.php
@@ -234,7 +234,7 @@ $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_configselect('memorylimit', get_string('memorylimit', 'admin'),
+$temp->add(new admin_setting_configselect('extramemorylimit', get_string('memorylimit', 'admin'),
                                           get_string('configmemorylimit', 'admin'), '128M',
                                           // if this option is set to 0, default 128M will be used
                                           array( '64M' => '64M',

diff --git a/version.php b/version.php
index 67967618710fe9515548713873afba2b54489cd7..d1a1872be98617c3b8e234672aea54f9ff649b16 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 = 2009033001;  // YYYYMMDD   = date of the last version bump
+    $version = 2009033002;  // YYYYMMDD   = date of the last version bump
                             //         XX = daily increments
 
     $release = '2.0 dev (Build: 20090330)';  // Human-friendly version name