Changeset 82
- Timestamp:
- 01/19/07 21:50:56 (2 years ago)
- Files:
-
- trunk/XJConf/XJConfLoader.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/XJConf/XJConfLoader.php
r78 r82 22 22 */ 23 23 private static $loadedClasses = array(); 24 24 25 25 /** 26 26 * method to load files from source path … … 43 43 return; 44 44 } 45 45 46 46 $realFiles = array(); 47 47 foreach ($classes as $className) { … … 50 50 } 51 51 52 $uri = null; 52 53 array_push(self::$loadedClasses, $className); 53 if (class_exists('StarClassRegistry') == false) { 54 require dirname(__FILE__) . '/' . self::mapClassname($className); 55 } else { 54 if (class_exists('StarClassRegistry', false) === true) { 56 55 if (substr($className, 0, 11) != 'net.xjconf.') { 57 56 $uri = StarClassRegistry::getUriForClass('net.xjconf.' . $className); … … 59 58 $uri = StarClassRegistry::getUriForClass($className); 60 59 } 61 62 require $uri;63 60 } 61 if ($uri === null) { 62 $uri = dirname(__FILE__) . '/' . self::mapClassname($className); 63 } 64 require $uri; 64 65 } 65 66 } 66 67 67 68 /** 68 69 * checks whether a file with the given class exists … … 76 77 return file_exists(dirname(__FILE__) . '/' . self::mapClassname($fqClassName)); 77 78 } 78 79 79 80 if (substr($fqClassName, 0, 11) != 'net.xjconf.') { 80 81 $fqClassName = 'net.xjconf.' . $fqClassName; … … 82 83 return (StarClassRegistry::getFileForClass($fqClassName) != null); 83 84 } 84 85 85 86 /** 86 87 * maps classnames given to loadClass() into required ones for load()
