Merge "(Bug785472) Remove unneeded raise_memory_limit calls"

htdocs/admin/groups/uploadcsv.php

@@ -18,7 +18,6 @@ require_once('pieforms/pieform.php');
 require_once(get_config('libroot') . 'group.php');
 require_once(get_config('libroot') . 'institution.php');
 safe_require('artefact', 'internal');
-raise_memory_limit("512M");
 
 // Turn on autodetecting of line endings, so mac newlines (\r) will work
 ini_set('auto_detect_line_endings', 1);

htdocs/admin/groups/uploadmemberscsv.php

@@ -18,7 +18,6 @@ require_once('pieforms/pieform.php');
 require_once(get_config('libroot') . 'group.php');
 require_once(get_config('libroot') . 'institution.php');
 safe_require('artefact', 'internal');
-raise_memory_limit("512M");
 
 // Turn on autodetecting of line endings, so mac newlines (\r) will work
 ini_set('auto_detect_line_endings', 1);

htdocs/admin/upgrade.php

@@ -122,8 +122,6 @@ $localsuccess  = json_encode(get_string('localdatasuccess', 'admin'));
 // Check if Mahara is being installed. An extra hook is required to insert core
 // data if so.
 if (!empty($upgrades['core']->install)) {
-    raise_time_limit(120);
-    raise_memory_limit('256M');
     $upgrades['firstcoredata'] = true;
     $upgrades['localpreinst'] = true;
     $upgrades['lastcoredata'] = true;

htdocs/admin/users/bulkimport.php

@@ -17,8 +17,6 @@ require_once('institution.php');
 require_once(get_config('docroot') . '/lib/htmloutput.php');
 safe_require('artefact', 'internal');
 safe_require('artefact', 'file');
-raise_memory_limit('1024M');
-set_time_limit(300); // 5 minutes
 
 define('TITLE', get_string('bulkleap2aimport', 'admin'));
 

htdocs/admin/users/uploadcsv.php

@@ -18,7 +18,6 @@ require_once('pieforms/pieform.php');
 require_once('institution.php');
 require_once('phpmailer/class.phpmailer.php');
 safe_require('artefact', 'internal');
-raise_memory_limit("512M");
 
 // Turn on autodetecting of line endings, so mac newlines (\r) will work
 ini_set('auto_detect_line_endings', 1);

htdocs/import/index.php

@@ -37,9 +37,6 @@ define('SECTION_PLUGINNAME', 'import');
 define('SECTION_PAGE', 'index');
 
 
-//TODO: Optimize!
-raise_memory_limit("512M");
-
 define('PRINTUPLOADFORM_ACT', 0);
 define('PRINTIMPORTITEMSFORM_ACT', 1);
 define('DOIMPORT_ACT', 2);

htdocs/lib/cron.php

@@ -28,7 +28,6 @@ $fake = isset($argv[1]);
 $start = $fake ? strtotime($argv[1]) : $realstart;
 
 log_info('---------- cron running ' . date('r', $start) . ' ----------');
-raise_memory_limit('128M');
 
 if (!is_writable(get_config('dataroot'))) {
     log_warn("Unable to write to dataroot directory.");

htdocs/lib/csvfile.php

@@ -10,7 +10,6 @@
  */
 
 defined('INTERNAL') || die();
-raise_memory_limit("512M");
 
 define('MAX_LINE_LENGTH', 1024);