From 41209c1e0f1ff05970637ac4e0d02bb9a08be907 Mon Sep 17 00:00:00 2001
From: Petr Skoda <skodak@moodle.org>
Date: Tue, 19 Oct 2010 10:17:48 +0000
Subject: [PATCH] MDL-24751 upgrades may need more memory

---
 lib/cronlib.php    | 2 +-
 lib/upgradelib.php | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/cronlib.php b/lib/cronlib.php
index d1904879550..8fd64a44886 100644
--- a/lib/cronlib.php
+++ b/lib/cronlib.php
@@ -51,7 +51,7 @@ function cron_run() {
     set_time_limit(0);
     $starttime = microtime();
 
-/// increase memory limit (PHP 5.2 does different calculation, we need more memory now)
+/// increase memory limit
     raise_memory_limit(MEMORY_EXTRA);
 
 /// emulate normal session
diff --git a/lib/upgradelib.php b/lib/upgradelib.php
index 2d359cd13a5..b6b1999df87 100644
--- a/lib/upgradelib.php
+++ b/lib/upgradelib.php
@@ -1278,6 +1278,8 @@ function install_core($version, $verbose) {
 function upgrade_core($version, $verbose) {
     global $CFG;
 
+    raise_memory_limit(MEMORY_EXTRA);
+
     require_once($CFG->libdir.'/db/upgrade.php');    // Defines upgrades
 
     try {
@@ -1341,6 +1343,8 @@ function upgrade_core($version, $verbose) {
 function upgrade_noncore($verbose) {
     global $CFG;
 
+    raise_memory_limit(MEMORY_EXTRA);
+
     // upgrade all plugins types
     try {
         $plugintypes = get_plugin_types();