Merge branch 'w30_MDL-40627_m26_extramemorylimit' of https://github.com/skodak/moodle

diff --git a/admin/settings/server.php b/admin/settings/server.php
index 154b98f..85e3f2d 100644 (file)
--- a/admin/settings/server.php
+++ b/admin/settings/server.php
@@ -182,7 +182,8 @@ $temp->add(new admin_setting_configselect('extramemorylimit', new lang_string('e
                                                  '128M' => '128M',
                                                  '256M' => '256M',
                                                  '512M' => '512M',
-                                                 '1024M' => '1024M'
+                                                 '1024M' => '1024M',
+                                                 '2048M' => '2048M',
                                              )));
 $temp->add(new admin_setting_configtext('curlcache', new lang_string('curlcache', 'admin'),
                                         new lang_string('configcurlcache', 'admin'), 120, PARAM_INT));

diff --git a/config-dist.php b/config-dist.php
index 6598ce3..63e7826 100644 (file)
--- a/config-dist.php
+++ b/config-dist.php
@@ -395,7 +395,7 @@ $CFG->admin = 'admin';
 // memory limit to something higher.
 // The value for the settings should be a valid PHP memory value. e.g. 512M, 1G
 //
-//     $CFG->extramemorylimit = '1G';
+//     $CFG->extramemorylimit = '1024M';
 //
 // Moodle 2.4 introduced a new cache API.
 // The cache API stores a configuration file within the Moodle data directory and