Merge pull request #5687 from relldoesphp/ckeditor_fix

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

diff --git a/CRM/Campaign/Form/Search/Campaign.php b/CRM/Campaign/Form/Search/Campaign.php
index b86df5830b12fdde068bcee61863866d3d9a4e56..188b4029ef9ff214e4e2f2c9fd0e7f66808e1f90 100755 (executable)
--- a/CRM/Campaign/Form/Search/Campaign.php
+++ b/CRM/Campaign/Form/Search/Campaign.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2014                                |
+ | Copyright CiviCRM LLC (c) 2004-2015                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -23,12 +23,12 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2014
+ * @copyright CiviCRM LLC (c) 2004-2015
  * $Id$
  *
  */
@@ -39,21 +39,20 @@
 class CRM_Campaign_Form_Search_Campaign extends CRM_Core_Form {
 
   /**
-   * Are we forced to run a search
+   * Are we forced to run a search.
    *
    * @var int
-   * @access protected
    */
   protected $_force;
 
   /**
-   * Processing needed for buildForm and later
+   * Processing needed for buildForm and later.
    *
    * @return void
-   * @access public
-   */ function preProcess() {
-    $this->_search    = CRM_Utils_Array::value('search', $_GET);
-    $this->_force     = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE, FALSE);
+   */
+  public function preProcess() {
+    $this->_search = CRM_Utils_Array::value('search', $_GET);
+    $this->_force = CRM_Utils_Request::retrieve('force', 'Boolean', $this, FALSE, FALSE);
     $this->_searchTab = CRM_Utils_Request::retrieve('type', 'String', $this, FALSE, 'campaign');
 
     //when we do load tab, lets load the default objects.
@@ -70,13 +69,12 @@ class CRM_Campaign_Form_Search_Campaign extends CRM_Core_Form {
   }
 
   /**
-   * Build the form object
+   * Build the form object.
    *
-   * @access public
    *
    * @return void
    */
-  function buildQuickForm() {
+  public function buildQuickForm() {
     if ($this->_search) {
       return;
     }
@@ -97,7 +95,8 @@ class CRM_Campaign_Form_Search_Campaign extends CRM_Core_Form {
     $campaignTypes = CRM_Campaign_PseudoConstant::campaignType();
     $this->add('select', 'campaign_type_id', ts('Campaign Type'),
       array(
-        '' => ts('- select -')) + $campaignTypes
+        '' => ts('- select -'),
+      ) + $campaignTypes
     );
 
     $this->set('campaignTypes', $campaignTypes);
@@ -107,7 +106,8 @@ class CRM_Campaign_Form_Search_Campaign extends CRM_Core_Form {
     $campaignStatus = CRM_Campaign_PseudoConstant::campaignStatus();
     $this->addElement('select', 'status_id', ts('Campaign Status'),
       array(
-        '' => ts('- select -')) + $campaignStatus
+        '' => ts('- select -'),
+      ) + $campaignStatus
     );
     $this->set('campaignStatus', $campaignStatus);
     $this->assign('campaignStatus', json_encode($campaignStatus));
@@ -125,5 +125,5 @@ class CRM_Campaign_Form_Search_Campaign extends CRM_Core_Form {
     $this->set('searchParams', $this->_searchParams);
     $this->assign('searchParams', json_encode($this->_searchParams));
   }
-}
 
+}