Commit 7ba1d72c authored by webchick's avatar webchick

Issue #2233929 by alexpott: Drupal_set_time_limit should only be able to increase the time limit.

parent 959fa9da
...@@ -1199,11 +1199,11 @@ function l($text, $path, array $options = array()) { ...@@ -1199,11 +1199,11 @@ function l($text, $path, array $options = array()) {
* into script execution a call such as set_time_limit(20) is made, the * into script execution a call such as set_time_limit(20) is made, the
* script will run for a total of 45 seconds before timing out. * script will run for a total of 45 seconds before timing out.
* *
* It also means that it is possible to decrease the total time limit if * If the current time limit is not unlimited it is possible to decrease the
* the sum of the new time limit and the current time spent running the * total time limit if the sum of the new time limit and the current time spent
* script is inferior to the original time limit. It is inherent to the way * running the script is inferior to the original time limit. It is inherent to
* set_time_limit() works, it should rather be called with an appropriate * the way set_time_limit() works, it should rather be called with an
* value every time you need to allocate a certain amount of time * appropriate value every time you need to allocate a certain amount of time
* to execute a task than only once at the beginning of the script. * to execute a task than only once at the beginning of the script.
* *
* Before calling set_time_limit(), we check if this function is available * Before calling set_time_limit(), we check if this function is available
...@@ -1220,8 +1220,12 @@ function l($text, $path, array $options = array()) { ...@@ -1220,8 +1220,12 @@ function l($text, $path, array $options = array()) {
*/ */
function drupal_set_time_limit($time_limit) { function drupal_set_time_limit($time_limit) {
if (function_exists('set_time_limit')) { if (function_exists('set_time_limit')) {
$current = ini_get('max_execution_time');
// Do not set time limit if it is currently unlimited.
if ($current !== 0) {
@set_time_limit($time_limit); @set_time_limit($time_limit);
} }
}
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment