Merge remote-tracking branch 'upstream/4.4' into 4.4-4.5-2014-09-29-13-10-47

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

diff --git a/CRM/Core/Module.php b/CRM/Core/Module.php
index 15fb78393e8f8f17496388ffc5c3006f42f87c53..29d5bab43174437af9a7b9424a319407fdfc54b3 100644 (file)
--- a/CRM/Core/Module.php
+++ b/CRM/Core/Module.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.                                    |
  |                                                                    |
@@ -31,7 +31,7 @@
  * a Joomla Plugin.
  *
  * @package CRM
- * @copyright CiviCRM LLC (c) 2004-2013
+ * @copyright CiviCRM LLC (c) 2004-2014
  * $Id$
  *
  */
@@ -47,6 +47,10 @@ class CRM_Core_Module {
    */
   public $is_active;
 
+  /**
+   * @param $name
+   * @param $is_active
+   */
   public function __construct($name, $is_active) {
     $this->name = $name;
     $this->is_active = $is_active;
@@ -59,6 +63,7 @@ class CRM_Core_Module {
     static $result;
     if ($fresh || !is_array($result)) {
       $result = CRM_Extension_System::singleton()->getMapper()->getModules();
+      $result[] = new CRM_Core_Module('civicrm', TRUE); // pseudo-module for core
 
       $config = CRM_Core_Config::singleton();
       if (is_callable(array($config->userSystem, 'getModules'))) {