projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
INFRA-132 - Fix spacing of @return tag in comments
[civicrm-core.git]
/
CRM
/
Member
/
Import
/
Controller.php
diff --git
a/CRM/Member/Import/Controller.php
b/CRM/Member/Import/Controller.php
index 63e7f2ec96aeed5089b9b9ce7c3d80ffe4e77d6b..ebce3a6fe60bf8087a25145056707c1e63cea688 100644
(file)
--- a/
CRM/Member/Import/Controller.php
+++ b/
CRM/Member/Import/Controller.php
@@
-1,9
+1,9
@@
<?php
/*
+--------------------------------------------------------------------+
<?php
/*
+--------------------------------------------------------------------+
- | CiviCRM version 4.
4
|
+ | CiviCRM version 4.
6
|
+--------------------------------------------------------------------+
+--------------------------------------------------------------------+
- | 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,16
+28,16
@@
/**
*
* @package CRM
/**
*
* @package CRM
- * @copyright CiviCRM LLC (c) 2004-201
3
+ * @copyright CiviCRM LLC (c) 2004-201
4
* $Id$
*
*/
class CRM_Member_Import_Controller extends CRM_Core_Controller {
/**
* $Id$
*
*/
class CRM_Member_Import_Controller extends CRM_Core_Controller {
/**
- *
c
lass constructor
+ *
C
lass constructor
*/
*/
- function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) {
+
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
parent::__construct($title, $modal);
// lets get around the time limit issue if possible, CRM-2113
@@
-55,4
+55,3
@@
class CRM_Member_Import_Controller extends CRM_Core_Controller {
$this->addActions($config->uploadDir, array('uploadFile'));
}
}
$this->addActions($config->uploadDir, array('uploadFile'));
}
}
-