Merge branch 4.5 into master

[civicrm-core.git] / CRM / Mailing / StateMachine / Send.php

diff --git a/CRM/Mailing/StateMachine/Send.php b/CRM/Mailing/StateMachine/Send.php
index ad400433de8174ca6edbbbe55b0b9e10602f1709..e9f55fa4e2830eeacff520e86b673427abc2d62f 100644 (file)
--- a/CRM/Mailing/StateMachine/Send.php
+++ b/CRM/Mailing/StateMachine/Send.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -40,15 +40,14 @@
 class CRM_Mailing_StateMachine_Send extends CRM_Core_StateMachine {
 
   /**
-   * class constructor
+   * Class constructor
    *
-   * @param object $controller
+   * @param CRM_Mailing_Controller $controller
    * @param \const|int $action
    *
-   * @internal param \CRM_Mailing_Controller $object
    * @return \CRM_Mailing_StateMachine_Send CRM_Mailing_StateMachine
    */
-  function __construct($controller, $action = CRM_Core_Action::NONE) {
+  public function __construct($controller, $action = CRM_Core_Action::NONE) {
     parent::__construct($controller, $action);
 
     $this->_pages = array(
@@ -74,4 +73,3 @@ class CRM_Mailing_StateMachine_Send extends CRM_Core_StateMachine {
     $this->addSequentialPages($this->_pages, $action);
   }
 }
-