Merge branch 'JohnFF-patch-1'

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

diff --git a/CRM/Core/Component/Config.php b/CRM/Core/Component/Config.php
index dc023911f77550b0293b4b64079995b35f5acec7..2ccd42971130a68afad8e9d1821c70918eb816eb 100644 (file)
--- a/CRM/Core/Component/Config.php
+++ b/CRM/Core/Component/Config.php
@@ -1,9 +1,9 @@
 <?php
 /*
  +--------------------------------------------------------------------+
- | CiviCRM version 4.4                                                |
+ | CiviCRM version 4.5                                                |
  +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2013                                |
+ | Copyright CiviCRM LLC (c) 2004-2014                                |
  +--------------------------------------------------------------------+
  | This file is a part of CiviCRM.                                    |
  |                                                                    |
@@ -30,7 +30,7 @@
  * and provides aggregation methods for injecting it into system config.
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -42,9 +42,11 @@ abstract class CRM_Core_Component_Config {
    * configuration file and injects them into system wide
    * configuration object.
    *
+   * @param $config
+   * @param $oldMode
+   *
    * @return array collection of component settings
    * @access public
-   *
    */
   public function add($config, $oldMode) {
     foreach (get_class_vars(get_class($this)) as $key => $value) {