Merge pull request #23691 from eileenmcnaughton/contact_type

[civicrm-core.git] / CRM / Event / Import / Controller.php

diff --git a/CRM/Event/Import/Controller.php b/CRM/Event/Import/Controller.php
index 57daa15a0bc0098348a3feb5e68a231c0620dda8..8d80c0758af6ce5979ed1dd63e5b81ca0ab4f5a3 100644 (file)
--- a/CRM/Event/Import/Controller.php
+++ b/CRM/Event/Import/Controller.php
@@ -13,25 +13,20 @@
  *
  * @package CRM
  * @copyright CiviCRM LLC https://civicrm.org/licensing
- * $Id$
- *
  */
 class CRM_Event_Import_Controller extends CRM_Core_Controller {
 
   /**
    * Class constructor.
    *
-   * @param null $title
+   * @param string $title
    * @param bool|int $action
    * @param bool $modal
    */
   public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) {
     parent::__construct($title, $modal);
 
-    // lets get around the time limit issue if possible, CRM-2113
-    if (!ini_get('safe_mode')) {
-      set_time_limit(0);
-    }
+    set_time_limit(0);
 
     $this->_stateMachine = new CRM_Import_StateMachine($this, $action);