Navigation

Changeset 101

Timestamp:

04/20/07 00:33:52 (1 year ago)

Author:

mikey

Message:

temporary bugfixes when loading classes with net.xjconf prefix and without (todo: use this prefix in xjconf itself, too)

Files:

r84	r101
40	40	$classes = func_get_args();
41	41	if (count($classes) == 0) {
42		// its ok to call this without any arguments, this won't cause any harm
	42	// its ok to call this without any arguments, this won't cause any harm
43	43	return;
44	44	}
…	…
46	46	$realFiles = array();
47	47	foreach ($classes as $className) {
48		if (in_array(~~$className~~, self::$loadedClasses) == TRUE) {
49		continue; // step to next file if file is already loaded
	48	if (in_array(str_replace('net.xjconf.', '', $className), self::$loadedClasses) == TRUE) {
	49	continue; // step to next file if file is already loaded
50	50	}
51	51
52	52	$uri = null;
53		array_push(self::$loadedClasses, ~~$className~~);
	53	array_push(self::$loadedClasses, str_replace('net.xjconf.', '', $className));
54	54	if (class_exists('StarClassRegistry', false) === true) {
55	55	if (substr($className, 0, 11) != 'net.xjconf.') {
…	…
62	62	$uri = dirname(__FILE__) . '/' . self::mapClassname($className);
63	63	}
	64
64	65	require $uri;
65	66	}
…	…
80	81	if (substr($className, 0, 11) != 'net.xjconf.') {
81	82	$fqClassName = 'net.xjconf.' . $className;
	83	} else {
	84	$fqClassName = $className;
82	85	}
	86
83	87	if (StarClassRegistry::getFileForClass($fqClassName) != null) {
84	88	return true;