From: Tim Otten <totten@civicrm.org>
Date: Mon, 29 Apr 2013 20:50:50 +0000 (-0700)
Subject: CRM-12370 - Reapply 2991458
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=92623713cbc89ecdbf97ff0aa6c165d9bc157c31;p=civicrm-core.git

CRM-12370 - Reapply 2991458

See also: #552, #560, #570

----------------------------------------
* CRM-12370: CRM_Utils_Hook::requireCiviModules() assigns infinite weight to extensions
  http://issues.civicrm.org/jira/browse/CRM-12370
---

diff --git a/CRM/Utils/Hook/Drupal.php b/CRM/Utils/Hook/Drupal.php
index e9ba66539e..e0c425c73b 100644
--- a/CRM/Utils/Hook/Drupal.php
+++ b/CRM/Utils/Hook/Drupal.php
@@ -85,6 +85,7 @@ class CRM_Utils_Hook_Drupal extends CRM_Utils_Hook {
       }
 
       // we should add civicrm's module's just after main civicrm drupal module
+      // Note: Assume that drupalModules and civiModules may each be array() or NULL
       if ($this->drupalModules !== NULL) {
         foreach ($this->drupalModules as $moduleName) {
           $this->allModules[$moduleName] = $moduleName;
@@ -96,6 +97,8 @@ class CRM_Utils_Hook_Drupal extends CRM_Utils_Hook {
             }
           }
         }
+      } else {
+        $this->allModules = (array) $this->civiModules;
       }
 
       if ($this->drupalModules !== NULL && $this->civiModules !== NULL) {