mirror of
https://github.com/moodle/moodle.git
synced 2025-01-29 19:50:14 +01:00
"MDL-18540, change the uses of option"
This commit is contained in:
parent
832e13f144
commit
1ed8e660fd
@ -363,10 +363,10 @@ class problem_000008 extends problem_base {
|
||||
}
|
||||
$oldmemlimit = get_real_size($oldmemlimit);
|
||||
//now lets change the memory limit to something unique below 128M==134217728
|
||||
if (empty($CFG->memorylimit)) {
|
||||
if (empty($CFG->extramemorylimit)) {
|
||||
raise_memory_limit('128M');
|
||||
} else {
|
||||
raise_memory_limit($CFG->memorylimit);
|
||||
raise_memory_limit($CFG->extramemorylimit);
|
||||
}
|
||||
$testmemlimit = get_real_size(@ini_get('memory_limit'));
|
||||
//verify the change had any effect at all
|
||||
|
@ -548,10 +548,10 @@
|
||||
return false;
|
||||
}
|
||||
@ini_set("max_execution_time","3000");
|
||||
if (empty($CFG->memorylimit)) {
|
||||
if (empty($CFG->extramemorylimit)) {
|
||||
raise_memory_limit('128M');
|
||||
} else {
|
||||
raise_memory_limit($CFG->memorylimit);
|
||||
raise_memory_limit($CFG->extramemorylimit);
|
||||
}
|
||||
|
||||
if (!$backup_unique_code = restore_precheck($destinationcourse,$pathtofile,$errorstr,true)) {
|
||||
|
@ -141,10 +141,10 @@
|
||||
|
||||
//Adjust some php variables to the execution of this script
|
||||
@ini_set("max_execution_time","3000");
|
||||
if (empty($CFG->memorylimit)) {
|
||||
if (empty($CFG->extramemorylimit)) {
|
||||
raise_memory_limit('128M');
|
||||
} else {
|
||||
raise_memory_limit($CFG->memorylimit);
|
||||
raise_memory_limit($CFG->extramemorylimit);
|
||||
}
|
||||
|
||||
//Call the form, depending the step we are
|
||||
|
@ -19,10 +19,10 @@
|
||||
|
||||
//Adjust some php variables to the execution of this script
|
||||
@ini_set("max_execution_time","3000");
|
||||
if (empty($CFG->memorylimit)) {
|
||||
if (empty($CFG->extramemorylimit)) {
|
||||
raise_memory_limit('128M');
|
||||
} else {
|
||||
raise_memory_limit($CFG->memorylimit);
|
||||
raise_memory_limit($CFG->extramemorylimit);
|
||||
}
|
||||
|
||||
echo "<pre>\n";
|
||||
|
@ -14,10 +14,10 @@
|
||||
|
||||
try{
|
||||
ini_set('max_execution_time', 300);
|
||||
if (empty($CFG->memorylimit)) {
|
||||
if (empty($CFG->extramemorylimit)) {
|
||||
raise_memory_limit('128M');
|
||||
} else {
|
||||
raise_memory_limit($CFG->memorylimit);
|
||||
raise_memory_limit($CFG->extramemorylimit);
|
||||
}
|
||||
|
||||
mtrace("\n--DELETE----");
|
||||
|
Loading…
x
Reference in New Issue
Block a user