Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2015-02-02-18-36-16

[civicrm-core.git] / CRM / Core / QuickForm / Action / Refresh.php

diff --git a/CRM/Core/QuickForm/Action/Refresh.php b/CRM/Core/QuickForm/Action/Refresh.php
index 0df1ad2b44a50a072b6be2faa624445715cc9e32..88542359296e5f4bf5ebd24ff20f9bd04778aefc 100644 (file)
--- a/CRM/Core/QuickForm/Action/Refresh.php
+++ b/CRM/Core/QuickForm/Action/Refresh.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        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Redefine the refresh action.
@@ -38,25 +38,26 @@ class CRM_Core_QuickForm_Action_Refresh extends CRM_Core_QuickForm_Action {
   /**
    * Class constructor
    *
-   * @param object $stateMachine reference to state machine object
+   * @param object $stateMachine
+   *   Reference to state machine object.
    *
    * @return \CRM_Core_QuickForm_Action_Refresh
-  @access public
    */
-  function __construct(&$stateMachine) {
+  public function __construct(&$stateMachine) {
     parent::__construct($stateMachine);
   }
 
   /**
    * Processes the request.
    *
-   * @param  CRM_Core_Form $page the current form-page
-   * @param  string $actionName Current action name, as one Action object can serve multiple actions
+   * @param CRM_Core_Form $page
+   *   The current form-page.
+   * @param string $actionName
+   *   Current action name, as one Action object can serve multiple actions.
    *
    * @return void
-   * @access public
    */
-  function perform(&$page, $actionName) {
+  public function perform(&$page, $actionName) {
     // save the form values and validation status to the session
     $page->isFormBuilt() or $page->buildForm();
 
@@ -65,7 +66,6 @@ class CRM_Core_QuickForm_Action_Refresh extends CRM_Core_QuickForm_Action {
     $data['values'][$pageName] = $page->exportValues();
     $data['valid'][$pageName] = $page->validate();
 
-
     // Modal form and page is invalid: don't go further
     if ($page->controller->isModal() && !$data['valid'][$pageName]) {
       return $page->handle('display');
@@ -76,5 +76,5 @@ class CRM_Core_QuickForm_Action_Refresh extends CRM_Core_QuickForm_Action {
 
     return $page->handle('jump');
   }
-}
 
+}