CRM-15735 fix - Update payment status for pay-later membership renewal ignores Receiv...

[civicrm-core.git] / CRM / Core / Component.php

diff --git a/CRM/Core/Component.php b/CRM/Core/Component.php
index ddd9138a2bcc8b29091e228b046426338da02af4..85c69308675466cdbdfeec609a8ae5ea497de122 100644 (file)
--- a/CRM/Core/Component.php
+++ b/CRM/Core/Component.php
@@ -23,7 +23,7 @@
  | GNU Affero General Public License or the licensing of CiviCRM,     |
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
-*/
+ */
 
 /**
  * Component stores all the static and dynamic information of the various
@@ -230,7 +230,7 @@ class CRM_Core_Component {
       $cfg = $comp->getConfigObject();
       $cfg->add($config, $oldMode);
     }
-    return;
+    return NULL;
   }
 
   /**
@@ -275,8 +275,8 @@ class CRM_Core_Component {
     $fields = array();
     foreach ($info as $name => $comp) {
       if ($comp->usesSearch()) {
-        $bqr    = $comp->getBAOQueryObject();
-        $flds   = $bqr->getFields();
+        $bqr = $comp->getBAOQueryObject();
+        $flds = $bqr->getFields();
         $fields = array_merge($fields, $flds);
       }
     }
@@ -327,7 +327,7 @@ class CRM_Core_Component {
    *
    * @return null
    */
-  static function &defaultReturnProperties(
+  public static function &defaultReturnProperties(
     $mode,
     $includeCustomFields = TRUE
   ) {
@@ -423,8 +423,6 @@ class CRM_Core_Component {
    * @param array $tables
    *   Array of tables.
    *
-   * @return null
-   * @static
    */
   public static function tableNames(&$tables) {
     $info = self::_info();
@@ -463,4 +461,5 @@ class CRM_Core_Component {
 
     return $components;
   }
+
 }