Merge pull request #2762 from amitajgaonkar/WebtestIssues

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

diff --git a/CRM/Activity/Import/Controller.php b/CRM/Activity/Import/Controller.php
index b85b021a8a966be2cab9b4d8eeacf205a7304db0..ff8030c1ec567af1ed051fd37b95b6419041c9ef 100644 (file)
--- a/CRM/Activity/Import/Controller.php
+++ b/CRM/Activity/Import/Controller.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.3                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -28,7 +28,7 @@
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -40,7 +40,12 @@ class CRM_Activity_Import_Controller extends CRM_Core_Controller {
   function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) {
     parent::__construct($title, $modal);
 
-    $this->_stateMachine = new CRM_Activity_Import_StateMachine($this, $action);
+    // lets get around the time limit issue if possible, CRM-2113
+    if (!ini_get('safe_mode')) {
+      set_time_limit(0);
+    }
+
+    $this->_stateMachine = new CRM_Import_StateMachine($this, $action);
 
     // create and instantiate the pages
     $this->addPages($this->_stateMachine, $action);