Browse Source

Adding check for existence of Core key in class.paths.php.
Change Configure::_ _writeConfig() to cache files for 10 seconds if DEBUG > 0.

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@4291 3807eeeb-6ff5-0310-8944-8be069107fe0

phpnut 19 years ago
parent
commit
bcd2a951e4
2 changed files with 15 additions and 6 deletions
  1. 4 4
      cake/basics.php
  2. 11 2
      cake/libs/configure.php

+ 4 - 4
cake/basics.php

@@ -164,7 +164,7 @@
 					require($models[$className]['path']);
 					Overloadable::overload($className);
 					return true;
-				} elseif(array_key_exists($className, $models['Core'])) {
+				} elseif(isset($models['Core']) && array_key_exists($className, $models['Core'])) {
 					require($models['Core'][$className]['path']);
 					Overloadable::overload($className);
 					return true;
@@ -282,7 +282,7 @@
 				if(array_key_exists($className, $controllers)) {
 					require($controllers[$className]['path']);
 					return true;
-				} elseif(array_key_exists($className, $controllers['Core'])) {
+				} elseif(isset($controllers['Core']) && array_key_exists($className, $controllers['Core'])) {
 					require($controllers['Core'][$className]['path']);
 					return true;
 				}
@@ -386,7 +386,7 @@
 				if(array_key_exists($className, $helpers)) {
 					require($helpers[$className]['path']);
 					return true;
-				} elseif(array_key_exists($className, $helpers['Core'])) {
+				} elseif(isset($helpers['Core']) && array_key_exists($className, $helpers['Core'])) {
 					require($helpers['Core'][$className]['path']);
 					return true;
 				}
@@ -459,7 +459,7 @@
 				if(array_key_exists($className, $components)) {
 					require($components[$className]['path']);
 					return true;
-				} elseif(array_key_exists($className, $components['Core'])) {
+				} elseif(isset($components['Core']) && array_key_exists($className, $components['Core'])) {
 					require($components['Core'][$className]['path']);
 					return true;
 				}

+ 11 - 2
cake/libs/configure.php

@@ -283,9 +283,18 @@ class Configure extends Object {
  */
 	function __writeConfig($content, $name, $write = true){
 		$file = CACHE . 'persistent' . DS . $name . '.php';
-		if(!file_exists($file)){
-			cache('persistent' . DS . $name . '.php', "<?php\n\$config = array();\n");
+
+		if (Configure::read() > 0) {
+			$expires = "+10 seconds";
+		} else {
+			$expires = "+999 days";
 		}
+
+		$cache = cache('persistent' . DS . $name . '.php', null, $expires);
+		if($cache === null){
+			cache('persistent' . DS . $name . '.php', "<?php\n\$config = array();\n", $expires);
+		}
+
 		if($write === true){
 			if(!class_exists('File')){
 				uses('File');