INFRA-132 - s/null/NULL/

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

diff --git a/CRM/Contact/Form/Edit/CommunicationPreferences.php b/CRM/Contact/Form/Edit/CommunicationPreferences.php
index 3ad492998516572a95be8d249a8f063d595574ef..3343286fd16c6a2c92bb59971d69f5ae8f1bf199 100644 (file)
--- a/CRM/Contact/Form/Edit/CommunicationPreferences.php
+++ b/CRM/Contact/Form/Edit/CommunicationPreferences.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -48,13 +48,13 @@ class CRM_Contact_Form_Edit_CommunicationPreferences {
   /**
    * Build the form object elements for Communication Preferences object
    *
-   * @param CRM_Core_Form $form       reference to the form object
+   * @param CRM_Core_Form $form
+   *   Reference to the form object.
    *
    * @return void
-   * @access public
    * @static
    */
-  static function buildQuickForm(&$form) {
+  public static function buildQuickForm(&$form) {
     // since the pcm - preferred comminication method is logically
     // grouped hence we'll use groups of HTML_QuickForm
 
@@ -133,15 +133,16 @@ class CRM_Contact_Form_Edit_CommunicationPreferences {
   /**
    * Global form rule
    *
-   * @param array $fields the input form values
-   * @param array $files the uploaded files if any
+   * @param array $fields
+   *   The input form values.
+   * @param array $files
+   *   The uploaded files if any.
    * @param $self
    *
    * @return true if no errors, else array of errors
-   * @access public
    * @static
    */
-  static function formRule($fields, $files, $self) {
+  public static function formRule($fields, $files, $self) {
     //CRM-4575
 
     $greetings = self::getGreetingFields($self->_contactType);
@@ -160,14 +161,13 @@ class CRM_Contact_Form_Edit_CommunicationPreferences {
    * Set default values for the form. Note that in edit/view mode
    * the default values are retrieved from the database
    *
-   * @access public
    *
    * @param CRM_Core_Form $form
    * @param $defaults
    *
    * @return void
    */
-  static function setDefaultValues(&$form, &$defaults) {
+  public static function setDefaultValues(&$form, &$defaults) {
 
     if (!empty($defaults['preferred_language'])) {
       $languages = CRM_Contact_BAO_Contact::buildOptions('preferred_language');
@@ -210,9 +210,8 @@ class CRM_Contact_Form_Edit_CommunicationPreferences {
    * @param $contactType
    *
    * @return void
-   * @access public
    */
-  static function getGreetingFields($contactType) {
+  public static function getGreetingFields($contactType) {
     if (empty(self::$greetings[$contactType])) {
       self::$greetings[$contactType] = array();
 
@@ -249,4 +248,3 @@ class CRM_Contact_Form_Edit_CommunicationPreferences {
     return self::$greetings[$contactType];
   }
 }
-