Remove nested conditional.

cakephp · Sep 15, 2013 · 616907c · 616907c
1 parent 99b1c0b
commit 616907c
Showing 1 changed file with 5 additions and 7 deletions.
diff --git a/Cake/Core/App.php b/Cake/Core/App.php
@@ -23,7 +23,6 @@
 /**
  * App is responsible for resource location, and path management.
  *
- *
  * ### Adding paths
  *
  * Additional paths for Views and Plugins are configured with Configure now. See App/Config/app.php for an
@@ -83,10 +82,8 @@ public static function classname($class, $type = '', $suffix = '') {
 		}
 
 		list($plugin, $name) = pluginSplit($class);
-		$checkCore = true;
 		if ($plugin) {
 			$base = Plugin::getNamespace($plugin);
-			$checkCore = false;
 		} else {
 			$base = Configure::read('App.namespace');
 		}
@@ -96,11 +93,12 @@ public static function classname($class, $type = '', $suffix = '') {
 		if (class_exists($base . $fullname)) {
 			return $base . $fullname;
 		}
+		if ($plugin) {
+			return false;
+		}
 
-		if ($checkCore) {
-			if (class_exists('Cake' . $fullname)) {
-				return 'Cake' . $fullname;
-			}
+		if (class_exists('Cake' . $fullname)) {
+			return 'Cake' . $fullname;
 		}
 		return false;
 	}