Merge pull request #4983 from colemanw/CRM-15842

[civicrm-core.git] / CRM / Group / Controller.php

diff --git a/CRM/Group/Controller.php b/CRM/Group/Controller.php
index 2e359ebfaa1e9db17e3fab5092d58fd1f187ace5..657ca23dc032692aac47965cd0a3c1b1fab0ed5e 100644 (file)
--- a/CRM/Group/Controller.php
+++ b/CRM/Group/Controller.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -35,9 +35,9 @@
 class CRM_Group_Controller extends CRM_Core_Controller {
 
   /**
-   * class constructor
+   * Class 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);
 
     $this->_stateMachine = new CRM_Group_StateMachine($this, $action);
@@ -68,12 +68,18 @@ class CRM_Group_Controller extends CRM_Core_Controller {
     $this->addActions($uploadDir, $uploadNames);
   }
 
-  function run() {
+  /**
+   * @return mixed
+   */
+  public function run() {
     return parent::run();
   }
 
+  /**
+   * @return mixed
+   */
   public function selectorName() {
     return $this->get('selectorName');
   }
-}
 
+}