MDL-24751 upgrades may need more memory

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

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();