From: Michael J. Rubinsky <mrubinsk@horde.org>
Date: Fri, 31 Jul 2009 21:34:19 +0000 (-0400)
Subject: Make sure prototype is included from addExternal() as well,
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=795b8b4ade88a6fc57651cc2a8b13e3316a855f9;p=horde.git

Make sure prototype is included from addExternal() as well,
otherwise includeing an external script file before any other horde
file would cause prototype.js to not be loaded.
---

diff --git a/framework/Core/lib/Horde/Script/Files.php b/framework/Core/lib/Horde/Script/Files.php
index 934f9eb14..aeb75cb98 100644
--- a/framework/Core/lib/Horde/Script/Files.php
+++ b/framework/Core/lib/Horde/Script/Files.php
@@ -90,6 +90,11 @@ class Horde_Script_Files
 
         $this->_included[$app][$url] = true;
 
+        // Always add prototype.js.
+        if (empty($this->_files) && ($file != 'prototype.js')) {
+            $this->add('prototype.js', 'horde', true);
+        }
+
         $this->_files[$app][] = array(
             'f' => basename($url),
             'u' => $url,