Merge branch '4.5' into master

[civicrm-core.git] / CRM / Pledge / Form / Search.php

diff --git a/CRM/Pledge/Form/Search.php b/CRM/Pledge/Form/Search.php
index 2de8900cdb6b7b9d5e6d148c75da8003a1b5269a..06deeeabfb86e708ec7fb21920ec5f6e1116e8c7 100644 (file)
--- a/CRM/Pledge/Form/Search.php
+++ b/CRM/Pledge/Form/Search.php
@@ -61,7 +61,6 @@ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search {
 
   /**
    * Prefix for the controller
-   *
    */
   protected $_prefix = "pledge_";
 
@@ -87,9 +86,9 @@ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search {
      * we allow the controller to set force/reset externally, useful when we are being
      * driven by the wizard framework
      */
-    $this->_reset   = CRM_Utils_Request::retrieve('reset', 'Boolean', CRM_Core_DAO::$_nullObject);
-    $this->_force   = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE);
-    $this->_limit   = CRM_Utils_Request::retrieve('limit', 'Positive', $this);
+    $this->_reset = CRM_Utils_Request::retrieve('reset', 'Boolean', CRM_Core_DAO::$_nullObject);
+    $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE);
+    $this->_limit = CRM_Utils_Request::retrieve('limit', 'Positive', $this);
     $this->_context = CRM_Utils_Request::retrieve('context', 'String', $this, FALSE, 'search');
 
     $this->assign("context", $this->_context);
@@ -121,7 +120,6 @@ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search {
       );
     }
 
-
     $this->_queryParams = CRM_Contact_BAO_Query::convertFormValues($this->_formValues);
     $selector = new CRM_Pledge_Selector_Search($this->_queryParams,
       $this->_action,
@@ -282,7 +280,7 @@ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search {
   }
 
   /**
-   * This function is used to add the rules (mainly global rules) for form.
+   * add the rules (mainly global rules) for form.
    * All local rules are added near the element
    *
    * @return void
@@ -295,10 +293,10 @@ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search {
   /**
    * Global validation rules for the form
    *
-   * @param array $fields posted values of the form
+   * @param array $fields
+   *   Posted values of the form.
    *
    * @return void
-   * @static
    */
   public static function formRule($fields) {
     $errors = array();
@@ -314,7 +312,8 @@ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search {
    * Set the default form values
    *
    *
-   * @return array the default array reference
+   * @return array
+   *   the default array reference
    */
   public function setDefaultValues() {
     $defaults = array();
@@ -423,4 +422,3 @@ class CRM_Pledge_Form_Search extends CRM_Core_Form_Search {
     return ts('Find Pledges');
   }
 }
-