diff --git a/htdocs/admin/groups/uploadcsv.php b/htdocs/admin/groups/uploadcsv.php index a27540b22302bce160176bb558fd552e1b9e44b2..13da1418133e04f57b50f1251a485e2f7884a034 100644 --- a/htdocs/admin/groups/uploadcsv.php +++ b/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); diff --git a/htdocs/admin/groups/uploadmemberscsv.php b/htdocs/admin/groups/uploadmemberscsv.php index d18acf4e6f223808dca03413b0ba6e419df2cbea..0d21b31bcfe5925d8562ef57cc82c63ae81d6914 100644 --- a/htdocs/admin/groups/uploadmemberscsv.php +++ b/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); diff --git a/htdocs/admin/upgrade.php b/htdocs/admin/upgrade.php index ac685a8d7e91d3e37660d71a5ad45f9494a9982b..166ed32148812199cad1939b68c4427a42739835 100644 --- a/htdocs/admin/upgrade.php +++ b/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; diff --git a/htdocs/admin/users/bulkimport.php b/htdocs/admin/users/bulkimport.php index df2942a044702468fe8b919797e8a715393a5076..7c81bd4d35623d9439942e220e18e4d61e0f9c40 100644 --- a/htdocs/admin/users/bulkimport.php +++ b/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')); diff --git a/htdocs/admin/users/uploadcsv.php b/htdocs/admin/users/uploadcsv.php index 6fe523e9b7868f7837235d41341e47b01cc2683e..fff2c32cd86a061685c04e98e40a955632588b00 100644 --- a/htdocs/admin/users/uploadcsv.php +++ b/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); diff --git a/htdocs/import/index.php b/htdocs/import/index.php index df43f9c52db3c205d1eee2a50cedda85397b4a49..d1016f4d430c2efee3d8fc37524bece4f1778686 100644 --- a/htdocs/import/index.php +++ b/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); diff --git a/htdocs/lib/cron.php b/htdocs/lib/cron.php index bb5d7944792488a3147b94aaeca77e68f9051067..13717b9a8ce731a1fad85e44157139caf1bf7d09 100644 --- a/htdocs/lib/cron.php +++ b/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."); diff --git a/htdocs/lib/csvfile.php b/htdocs/lib/csvfile.php index 249b693b24a94fc9a24a662648c9ca6229d65162..7358f1156fac93173c2b98255567d14da8553d08 100644 --- a/htdocs/lib/csvfile.php +++ b/htdocs/lib/csvfile.php @@ -10,7 +10,6 @@ */ defined('INTERNAL') || die(); -raise_memory_limit("512M"); define('MAX_LINE_LENGTH', 1024);