projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'upstream/4.4' into 4.4-master-2014-04-03-23-46-36
[civicrm-core.git]
/
CRM
/
Contact
/
Import
/
Controller.php
diff --git
a/CRM/Contact/Import/Controller.php
b/CRM/Contact/Import/Controller.php
index c1cf2c7a8715e041c37414fe93171db935d4af38..d5536b2505f9015a65c3fcf7eb41ada6d7dd574e 100644
(file)
--- a/
CRM/Contact/Import/Controller.php
+++ b/
CRM/Contact/Import/Controller.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
3
|
+ | CiviCRM version 4.
5
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-201
3
|
+ | Copyright CiviCRM LLC (c) 2004-201
4
|
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
+--------------------------------------------------------------------+
| This file is a part of CiviCRM. |
| |
@@
-28,7
+28,7
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id$
*
*/
* $Id$
*
*/
@@
-45,7
+45,7
@@
class CRM_Contact_Import_Controller extends CRM_Core_Controller {
set_time_limit(0);
}
set_time_limit(0);
}
- $this->_stateMachine = new CRM_
Contact_
Import_StateMachine($this, $action);
+ $this->_stateMachine = new CRM_Import_StateMachine($this, $action);
// create and instantiate the pages
$this->addPages($this->_stateMachine, $action);
// create and instantiate the pages
$this->addPages($this->_stateMachine, $action);