From: Michael M Slusarz <slusarz@curecanti.org>
Date: Wed, 24 Jun 2009 18:23:12 +0000 (-0600)
Subject: Autoloading needs to be done in Registry::
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=30273c705b38a3c19e92cd45a158b639507b151b;p=horde.git

Autoloading needs to be done in Registry::
---

diff --git a/imp/lib/base.php b/imp/lib/base.php
index e3b997ba8..7dcb6403b 100644
--- a/imp/lib/base.php
+++ b/imp/lib/base.php
@@ -32,13 +32,10 @@
  */
 
 // Determine BASE directories.
-$imp_dir = dirname(__FILE__);
-require_once $imp_dir . '/base.load.php';
+require_once dirname(__FILE__) . '/base.load.php';
 
-// Load the Horde Framework core, and set up inclusion paths.
+// Load the Horde Framework core.
 require_once HORDE_BASE . '/lib/core.php';
-Horde_Autoloader::addClassPath($imp_dir);
-Horde_Autoloader::addClassPattern('/^IMP_/', $imp_dir);
 
 // Registry.
 $s_ctrl = 0;
diff --git a/ingo/lib/base.php b/ingo/lib/base.php
index 5a6d1481f..b9b45dfd3 100644
--- a/ingo/lib/base.php
+++ b/ingo/lib/base.php
@@ -13,13 +13,10 @@
  */
 
 // Determine BASE directories.
-$ingo_dir = dirname(__FILE__);
-require_once $ingo_dir . '/base.load.php';
+require_once dirname(__FILE__) . '/base.load.php';
 
-// Load the Horde Framework core, and set up inclusion paths.
+// Load the Horde Framework core.
 require_once HORDE_BASE . '/lib/core.php';
-Horde_Autoloader::addClassPath($ingo_dir);
-Horde_Autoloader::addClassPattern('/^Ingo_/', $ingo_dir);
 
 // Registry.
 $registry = &Registry::singleton();
diff --git a/jeta/lib/base.php b/jeta/lib/base.php
index 842c0860a..93858d948 100644
--- a/jeta/lib/base.php
+++ b/jeta/lib/base.php
@@ -22,10 +22,8 @@ if (!defined('JETA_BASE')) {
     define('JETA_BASE', dirname(__FILE__) . '/..');
 }
 
-// Load the Horde Framework core, and set up inclusion paths.
+// Load the Horde Framework core.
 require_once HORDE_BASE . '/lib/core.php';
-require_once 'Horde/Autoloader.php';
-Horde_Autoloader::addClassPattern('/^Jeta_/', JETA_BASE . '/lib/');
 
 // Registry.
 $registry = &Registry::singleton();
diff --git a/kronolith/lib/base.php b/kronolith/lib/base.php
index 5243d3f8c..d8fb3865c 100644
--- a/kronolith/lib/base.php
+++ b/kronolith/lib/base.php
@@ -9,19 +9,14 @@
  * used:
  * - $session_control - Sets special session control limitations
  *
- * $Horde: kronolith/lib/base.php,v 1.142 2008/10/15 15:15:14 jan Exp $
- *
  * @package Kronolith
  */
 
 // Determine BASE directories.
-$kronolith_dir = dirname(__FILE__);
-require_once $kronolith_dir . '/base.load.php';
+require_once dirname(__FILE__) . '/base.load.php';
 
-/* Load the Horde Framework core, and set up inclusion paths. */
+/* Load the Horde Framework core. */
 require_once HORDE_BASE . '/lib/core.php';
-Horde_Autoloader::addClassPath($kronolith_dir);
-Horde_Autoloader::addClassPattern('/^Kronolith_/', $kronolith_dir);
 
 /* Registry. */
 $session_control = Horde_Util::nonInputVar('session_control');
diff --git a/news/lib/base.php b/news/lib/base.php
index fc4e2e66b..5fae630a5 100644
--- a/news/lib/base.php
+++ b/news/lib/base.php
@@ -19,13 +19,9 @@ if (!defined('HORDE_BASE')) {
     define('HORDE_BASE', dirname(__FILE__) . '/../..');
 }
 
-// Load the Horde Framework core, and set up inclusion paths.
+// Load the Horde Framework core.
 require_once HORDE_BASE . '/lib/core.php';
 
-$news_dir = dirname(__FILE__);
-Horde_Autoloader::addClassPath($news_dir);
-Horde_Autoloader::addClassPattern('/^News/', $news_dir);
-
 // Registry.
 $registry = &Registry::singleton();
 if (($pushed = $registry->pushApp('news', !defined('AUTH_HANDLER'))) instanceof PEAR_Error) {
diff --git a/timeobjects/lib/base.php b/timeobjects/lib/base.php
index 82c58675f..0fc4c1749 100644
--- a/timeobjects/lib/base.php
+++ b/timeobjects/lib/base.php
@@ -17,10 +17,8 @@ if (!defined('HORDE_BASE')) {
     }
 }
 
-/* Load the Horde Framework core, and set up inclusion paths. */
+/* Load the Horde Framework core. */
 require_once HORDE_BASE . '/lib/core.php';
-Horde_Autoloader::addClassPath($rto_dir);
-Horde_Autoloader::addClassPattern('/^TimeObjects_/', $rto_dir);
 
 /* Registry. */
 $session_control = Horde_Util::nonInputVar('session_control');