Fixing failing test.

cakephp · Jul 10, 2010 · d28f7f4 · d28f7f4
1 parent f202f89
commit d28f7f4
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/cake/libs/configure.php b/cake/libs/configure.php
@@ -615,7 +615,7 @@ public static function build($paths = array(), $reset = false) {
 				$merge = array_merge($merge, (array)$core[$type]);
 			}
 
-			if (empty($_this->{$type}) || empty($paths)) {
+			if (empty(self::${$type}) || empty($paths)) {
 				self::${$type} = $default;
 			}
 

diff --git a/cake/tests/cases/libs/configure.test.php b/cake/tests/cases/libs/configure.test.php
@@ -638,7 +638,6 @@ function testFileLoading () {
 		$file = App::import('File', 'NoFile', false, array(), TEST_CAKE_CORE_INCLUDE_PATH  . 'config' . DS . 'cake' . DS . 'config.php');
 		$this->assertFalse($file);
 	}
-	// import($type = null, $name = null, $parent = true, $file = null, $search = array(), $return = false) {
 
 /**
  * testFileLoadingWithArray method