Merge pull request #4809 from totten/master-cs2

[civicrm-core.git] / CRM / Contact / Form / Location.php

diff --git a/CRM/Contact/Form/Location.php b/CRM/Contact/Form/Location.php
index 5e49549418615d0c79356e5d52d5cea57e9edbd6..c858eaec2717b6533dd32bb414ecc4c26ba63093 100644 (file)
--- a/CRM/Contact/Form/Location.php
+++ b/CRM/Contact/Form/Location.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -35,13 +35,13 @@
 class CRM_Contact_Form_Location {
 
   /**
-   * set variables up before form is built
+   * Set variables up before form is built
    *
    * @param CRM_Core_Form $form
    *
    * @return void
    */
-  static function preProcess(&$form) {
+  public static function preProcess(&$form) {
     $form->_addBlockName = CRM_Utils_Request::retrieve('block', 'String', CRM_Core_DAO::$_nullObject);
     $additionalblockCount = CRM_Utils_Request::retrieve('count', 'Positive', CRM_Core_DAO::$_nullObject);
 
@@ -79,9 +79,8 @@ class CRM_Contact_Form_Location {
    * @param CRM_Core_Form $form
    *
    * @return void
-   * @access public
    */
-  static function buildQuickForm(&$form) {
+  public static function buildQuickForm(&$form) {
     // required for subsequent AJAX requests.
     $ajaxRequestBlocks = array();
     $generateAjaxRequest = 0;
@@ -121,4 +120,3 @@ class CRM_Contact_Form_Location {
     $form->assign('ajaxRequestBlocks', $ajaxRequestBlocks);
   }
 }
-