projects
/
civicrm-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
009a445
)
CRM_Core_BAO_CMSUser - do not set time limit for PHP CLI execution
author
Aron Novak
<aron.novak@agenceinovae.com>
Tue, 7 Apr 2015 03:25:36 +0000
(23:25 -0400)
committer
Aron Novak
<aron.novak@agenceinovae.com>
Tue, 7 Apr 2015 03:25:36 +0000
(23:25 -0400)
CRM/Core/BAO/CMSUser.php
patch
|
blob
|
blame
|
history
diff --git
a/CRM/Core/BAO/CMSUser.php
b/CRM/Core/BAO/CMSUser.php
index 87ae27495047236ef9fb013c88b06e59f06efb59..82ac953ebd655c4bd1cb1507dc3cfa632efb309a 100644
(file)
--- a/
CRM/Core/BAO/CMSUser.php
+++ b/
CRM/Core/BAO/CMSUser.php
@@
-94,7
+94,9
@@
class CRM_Core_BAO_CMSUser {
CRM_Core_Error::fatal('CMS user creation not supported for this framework');
}
- set_time_limit(300);
+ if (PHP_SAPI != 'cli') {
+ set_time_limit(300);
+ }
if ($config->userSystem->is_drupal == '1') {
$user = new StdClass();