← All changes | includes/autoloader.php +14 -7 trunk → 3.0.2 View file →

		@@ -127,11 +127,11 @@
127	127
128	128	// replace the namespace prefix with the base directory,
129	129	// replace namespace separators with directory separators
130	130	// in the relative class name, append with .php
131		- $file = $base_dir
132		- . strtolower ( str_replace( '\\', '/', $relative_class ) )
133		- . '.php';
	131	+ $file = strtolower ( $base_dir
	132	+ . str_replace( '\\', '/', $relative_class )
	133	+ . '.php' );
134	134
135	135	// if the mapped file exists, require it
136	136	if ( $this->requireFile( $file ) ) {
137	137	// yes, we're done
		@@ -139,15 +139,22 @@
139	139	}
140	140
141	141	//No match above. Also try Class name as filename.
142	142	//Example: Shipping.php is in MakeCommerce namespace but not in shipping namespace to avoid MakeCommerce\Shipping\Shipping
	143	+
	144	+
	145	+ //echo ($relative_class);
	146	+ //echo " >>> ";
143	147	$tmpRelativeClass = explode( '\\', $relative_class );
144	148	$tmpRelativeClass = end( $tmpRelativeClass );
	149	+ //echo($tmpRelativeClass);
	150	+ //echo "<br><br>";
145	151
146		- $file = $base_dir
147		- . strtolower ( str_replace( '\\', '/', $relative_class )
148		- . "/" . $tmpRelativeClass )
149		- . '.php';
	152	+
	153	+ $file = strtolower ( $base_dir
	154	+ . str_replace( '\\', '/', $relative_class )
	155	+ . "/" . $tmpRelativeClass
	156	+ . '.php' );
150	157
151	158	if ( $this->requireFile( $file ) ) {
152	159	// yes, we're done
153	160	return $file;