From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Sun, 22 Nov 2009 15:16:09 +0000 (-0500)
Subject: Force external scripts under Horde scope to better avoid duplicates and to ensure... 
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=905778428451a5443c7d70a397e9f5df60350044;p=horde.git

Force external scripts under Horde scope to better avoid duplicates and to ensure they are loaded
before other application specific files
---

diff --git a/framework/Core/lib/Horde/Script/Files.php b/framework/Core/lib/Horde/Script/Files.php
index e7a2bf3bc..c16c705ac 100644
--- a/framework/Core/lib/Horde/Script/Files.php
+++ b/framework/Core/lib/Horde/Script/Files.php
@@ -79,9 +79,9 @@ class Horde_Script_Files
      */
     public function addExternal($url, $app = null)
     {
-        if (is_null($app)) {
-            $app = $GLOBALS['registry']->getApp();
-        }
+        // Force external scripts under Horde scope to better avoid duplicates,
+        // and to ensure they are loaded before other application specific files
+        $app = 'Horde';
 
         // Don't include scripts multiple times.
         if (!empty($this->_included[$app][$url])) {