From: Jan Schneider <jan@horde.org>
Date: Wed, 8 Dec 2010 18:10:15 +0000 (+0100)
Subject: Fix bootstrapping.
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=4d77c15d2838c03de0e04dfed4de49e8c234fa61;p=horde.git

Fix bootstrapping.
---

diff --git a/vilma/lib/Application.php b/vilma/lib/Application.php
index c9b5e41d1..f7dd28fd9 100644
--- a/vilma/lib/Application.php
+++ b/vilma/lib/Application.php
@@ -15,7 +15,25 @@
  * @author  Ben Klang <ben@alkaloid.net>
  * @package Vilma
  */
-define('VILMA_BASE', dirname(__FILE__) . '/..');
+
+/* Determine the base directories. */
+if (!defined('VILMA_BASE')) {
+    define('VILMA_BASE', dirname(__FILE__) . '/..');
+}
+
+if (!defined('HORDE_BASE')) {
+    /* If Horde does not live directly under the app directory, the HORDE_BASE
+     * constant should be defined in config/horde.local.php. */
+    if (file_exists(VILMA_BASE . '/config/horde.local.php')) {
+        include VILMA_BASE . '/config/horde.local.php';
+    } else {
+        define('HORDE_BASE', VILMA_BASE . '/..');
+    }
+}
+
+/* Load the Horde Framework core (needed to autoload
+ * Horde_Registry_Application::). */
+require_once HORDE_BASE . '/lib/core.php';
 
 class Vilma_Application extends Horde_Registry_Application
 {