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

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

diff --git a/CRM/Admin/Form/Preferences/Campaign.php b/CRM/Admin/Form/Preferences/Campaign.php
index 1a907fb11e6c4eaa129fd9371a9641fd108a613a..346814d188cdd381bad1a2338288e5b3e6eeeb0f 100644 (file)
--- a/CRM/Admin/Form/Preferences/Campaign.php
+++ b/CRM/Admin/Form/Preferences/Campaign.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        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  *
@@ -38,11 +38,10 @@
  *
  */
 class CRM_Admin_Form_Preferences_Campaign extends CRM_Admin_Form_Preferences {
-  function preProcess() {
+  public function preProcess() {
     CRM_Utils_System::setTitle(ts('CiviCampaign Component Settings'));
     $this->_varNames = array(
-      CRM_Core_BAO_Setting::CAMPAIGN_PREFERENCES_NAME =>
-      array(
+      CRM_Core_BAO_Setting::CAMPAIGN_PREFERENCES_NAME => array(
         'tag_unconfirmed' => array(
           'html_type' => 'text',
           'title' => ts('Tag for Unconfirmed Petition Signers'),
@@ -60,5 +59,5 @@ class CRM_Admin_Form_Preferences_Campaign extends CRM_Admin_Form_Preferences {
 
     parent::preProcess();
   }
-}
 
+}