Optimize view paths caching for plugins.

Closes #2047
cakephp · Apr 19, 2014 · 6bdfdfd · 6bdfdfd
1 parent d54fbe6
commit 6bdfdfd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/lib/Cake/Test/Case/Utility/DebuggerTest.php b/lib/Cake/Test/Case/Utility/DebuggerTest.php
@@ -362,6 +362,7 @@ public function testExportVar() {
 	)
 	[protected] _scripts => array()
 	[protected] _paths => array()
+	[protected] _pathsForPlugin => array()
 	[protected] _parents => array()
 	[protected] _current => null
 	[protected] _currentType => ''

diff --git a/lib/Cake/View/View.php b/lib/Cake/View/View.php
@@ -251,6 +251,13 @@ class View extends Object {
  */
 	protected $_paths = array();
 
+/**
+ * Holds an array of plugin paths.
+ *
+ * @var array
+ */
+	protected $_pathsForPlugin = array();
+
 /**
  * The names of views and their parents used with View::extend();
  *
@@ -1112,8 +1119,13 @@ protected function _getElementFileName($name) {
  * @return array paths
  */
 	protected function _paths($plugin = null, $cached = true) {
-		if ($plugin === null && $cached === true && !empty($this->_paths)) {
-			return $this->_paths;
+		if ($cached === true) {
+			if ($plugin === null && !empty($this->_paths)) {
+				return $this->_paths;
+			}
+			if ($plugin !== null && isset($this->_pathsForPlugin[$plugin])) {
+				return $this->_pathsForPlugin[$plugin];
+			}
 		}
 		$paths = array();
 		$viewPaths = App::path('View');
@@ -1145,7 +1157,7 @@ protected function _paths($plugin = null, $cached = true) {
 		}
 		$paths = array_merge($paths, $corePaths);
 		if ($plugin !== null) {
-			return $paths;
+			return $this->_pathsForPlugin[$plugin] = $paths;
 		}
 		return $this->_paths = $paths;
 	}