From 440e0a0a3dc414fad33914251b2181abb4720e2d Mon Sep 17 00:00:00 2001
From: Chuck Hagenbuch <chuck@horde.org>
Date: Fri, 4 Jun 2010 22:41:36 -0400
Subject: [PATCH] Remove the last Horde_Autoloader:: static calls

---
 framework/Core/lib/Horde/Registry.php                      | 10 +++++-----
 framework/Date_Parser/examples/Horde/Date/Parser/parse.php |  4 ++--
 framework/Model/www/test.php                               |  1 -
 framework/bin/test_framework                               |  4 ++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/framework/Core/lib/Horde/Registry.php b/framework/Core/lib/Horde/Registry.php
index 63d64aef2..279edb9ac 100644
--- a/framework/Core/lib/Horde/Registry.php
+++ b/framework/Core/lib/Horde/Registry.php
@@ -276,11 +276,6 @@ class Horde_Registry
             )
         );
 
-        /* Setup autoloader callbacks. */
-        foreach ($callbacks as $key => $val) {
-            Horde_Autoloader::addCallback($key, array($val, 'callback'));
-        }
-
         /* Setup injector. */
         $GLOBALS['injector'] = $injector = new Horde_Injector(new Horde_Injector_TopLevel());
 
@@ -294,7 +289,12 @@ class Horde_Registry
         $GLOBALS['registry'] = $this;
         $injector->setInstance('Horde_Registry', $this);
 
+        /* Setup autoloader instance and callbacks. */
         $injector->setInstance('Horde_Autoloader', $GLOBALS['__autoloader']);
+        foreach ($callbacks as $key => $val) {
+            $GLOBALS['__autoloader']->addCallback($key, array($val, 'callback'));
+        }
+
 
         /* Initialize browser object. */
         $GLOBALS['browser'] = $injector->getInstance('Horde_Browser');
diff --git a/framework/Date_Parser/examples/Horde/Date/Parser/parse.php b/framework/Date_Parser/examples/Horde/Date/Parser/parse.php
index 8f8768319..6814a4a58 100644
--- a/framework/Date_Parser/examples/Horde/Date/Parser/parse.php
+++ b/framework/Date_Parser/examples/Horde/Date/Parser/parse.php
@@ -1,7 +1,7 @@
 <?php
 
-require 'Horde/Autoloader.php';
-Horde_Autoloader::addClassPath(dirname(dirname(dirname(dirname(dirname(__FILE__))))) . '/lib');
+set_include_path(dirname(dirname(dirname(dirname(dirname(__FILE__))))) . '/lib:' . get_include_path());
+require 'Horde/Core/Autoloader.php';
 
 $t = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'this fortnight';
 $opts = count($_SERVER['argv']) > 1 ? array() : array('now' => new Horde_Date('2006-08-16 14:00:00'));
diff --git a/framework/Model/www/test.php b/framework/Model/www/test.php
index 8255f6192..87466f728 100644
--- a/framework/Model/www/test.php
+++ b/framework/Model/www/test.php
@@ -10,7 +10,6 @@ $horde_base = '/path/to/horde';
 
 require_once $horde_base . '/lib/Application.php';
 Horde_Registry::appInit('horde', array('authentication' => 'none'));
-Horde_Autoloader::addClassPath(dirname(__FILE__));
 
 $vars = Horde_Variables::getDefaultVariables();
 
diff --git a/framework/bin/test_framework b/framework/bin/test_framework
index 734180f4a..66d156e4a 100755
--- a/framework/bin/test_framework
+++ b/framework/bin/test_framework
@@ -12,8 +12,8 @@
 
 require_once 'PHPUnit/Util/Filter.php';
 require_once 'PHPUnit/TextUI/Command.php';
-require 'Horde/Autoloader.php';
-Horde_Autoloader::addClassPath(dirname(dirname(dirname(__FILE__))) . '/lib');
+set_include_path(dirname(dirname(dirname(__FILE__))) . '/lib:' . get_include_path());
+require 'Horde/Core/Autoloader.php';
 
 PHPUnit_Util_Filter::addFileToFilter(__FILE__, 'PHPUNIT');
 
-- 
2.11.0