From 0a08cb403003a779fa7e30500936fcca6ac8a7a1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Petr=20S=CC=8Ckoda?= <commits@skodak.org>
Date: Sat, 20 Jul 2013 15:02:51 +0200
Subject: [PATCH] MDL-40627 add 2G extramemorylimit option to admin UI and use
 the same units in config-dist.php to prevent confusion

Credit goes to Julien Boulen, thanks for spotting this.
---
 admin/settings/server.php | 3 ++-
 config-dist.php           | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/admin/settings/server.php b/admin/settings/server.php
index 154b98f84b1..85e3f2dc6c3 100644
--- 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 e22d246d37d..cd780cf75ea 100644
--- a/config-dist.php
+++ b/config-dist.php
@@ -392,7 +392,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
-- 
2.17.1