#1206: Move loading of autoload.xml into Agavi::bootstrap()
---------------------+------------------------------------------------------
Reporter: david | Owner: david
Type: task | Status: new
Priority: low | Milestone: 1.1
Component: core | Version:
Severity: trivial | Keywords:
Has_patch: 1 |
---------------------+------------------------------------------------------
{{{
#!diff
Index: src/core/Agavi.class.php
===================================================================
--- src/core/Agavi.class.php (Revision 4375)
+++ src/core/Agavi.class.php (Arbeitskopie)
@@ -32,7 +32,7 @@
/**
* @var array An assoc array of classes and files used for
autoloading.
*/
- public static $autoloads = null;
+ public static $autoloads = array();
/**
* Handles autoloading of classes
@@ -44,26 +44,6 @@
*/
public static function __autoload($class)
{
- if(self::$autoloads === null) {
- self::$autoloads = array();
- // catch parse errors of autoload.xml
- try {
- $cfg = AgaviConfig::get('core.config_dir')
. '/autoload.xml';
- if(!is_readable($cfg)) {
- $cfg =
AgaviConfig::get('core.system_config_dir') . '/autoload.xml';
- if(!is_readable($cfg)) {
- return;
- }
- }
- self::$autoloads =
include(AgaviConfigCache::checkConfig($cfg));
- // if(class_exists($class, false)) {
- // return;
- // }
- } catch(Exception $e) {
- trigger_error($e->getMessage(),
E_USER_ERROR);
- }
- }
-
if(isset(self::$autoloads[$class])) {
// class exists, let's include it
require(self::$autoloads[$class]);
@@ -143,6 +123,12 @@
AgaviConfig::set('core.cldr_dir',
AgaviConfig::get('core.agavi_dir') . '/translation/data', false, true);
+ $cfg = AgaviConfig::get('core.config_dir') .
'/autoload.xml';
+ if(!is_readable($cfg)) {
+ $cfg =
AgaviConfig::get('core.system_config_dir') . '/autoload.xml';
+ }
+ self::$autoloads =
include(AgaviConfigCache::checkConfig($cfg));
+
// load base settings
AgaviConfigCache::load(AgaviConfig::get('core.config_dir') .
'/settings.xml');
}}}
http://groups.google.com/group/agavi-
dev/browse_thread/thread/cbc668092aba5cad
--
Ticket URL: <http://trac.agavi.org/ticket/1206>
Agavi <http://www.agavi.org/>
An MVC Framework for PHP5
_______________________________________________
Agavi Tickets Mailing List
[email protected]
http://lists.agavi.org/mailman/listinfo/tickets
