Merge pull request #4812 from colemanw/CRM-15495

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

diff --git a/CRM/Contact/Form/CustomData.php b/CRM/Contact/Form/CustomData.php
index 8d9d3641cd007229aaf2d1488881f496b622174b..022534ea151568443f4524745f970f583b3b65f8 100644 (file)
--- a/CRM/Contact/Form/CustomData.php
+++ b/CRM/Contact/Form/CustomData.php
@@ -1,7 +1,7 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.5                                                |
+ | CiviCRM version 4.6                                                |
  +--------------------------------------------------------------------+
  | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
@@ -61,7 +61,6 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
    * Entity sub type of the table id
    *
    * @var string
-   * @access protected
    */
   protected $_entitySubType;
 
@@ -97,7 +96,6 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
    * Custom group id
    *
    * @int
-   * @access public
    */
   public $_groupID;
 
@@ -113,10 +111,9 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
    *
    * @return void
    *
-   * @access public
    *
    */
-  function preProcess() {
+  public function preProcess() {
     $this->_cdType = CRM_Utils_Array::value('type', $_GET);
     $this->assign('cdType', FALSE);
     $this->_multiRecordDisplay = CRM_Utils_Request::retrieve('multiRecordDisplay', 'String', $this);
@@ -178,7 +175,6 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
    * Build the form object
    *
    * @return void
-   * @access public
    */
   public function buildQuickForm() {
     if ($this->_cdType || $this->_multiRecordDisplay == 'single') {
@@ -236,11 +232,10 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
   /**
    * Set the default form values
    *
-   * @access protected
    *
    * @return array the default array reference
    */
-  function setDefaultValues() {
+  public function setDefaultValues() {
     if ($this->_cdType || $this->_multiRecordDisplay == 'single') {
       if ($this->_copyValueId) {
         // cached tree is fetched
@@ -294,7 +289,6 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
   /**
    * Process the user submitted custom data values.
    *
-   * @access public
    *
    * @return void
    */
@@ -318,4 +312,4 @@ class CRM_Contact_Form_CustomData extends CRM_Core_Form {
     // reset the group contact cache for this group
     CRM_Contact_BAO_GroupContactCache::remove();
   }
-}
\ No newline at end of file
+}