3.0.3 bugs

Author: charliepage88

CHANGELOG.md

@@ -47,5 +47,7 @@
 * FF Bug - /adaptcms/admin/links(polls) :: clearfix
 * Bug - /adaptcms/js/admin.articles.js :: line 317 getContent() on tinyMCE
 * Bug - /adaptcms/admin/fields/edit/2 :: remove hidden-xs class.
-* TODO Bug - Issues with including JS repeatedly on an angularJS admin page. Clearing cache fixes it, but need a better solution.
-* Bug - Adjust datepicker so after selecting date, it hides. Good way to see how this gets annoying as is, is on the polls add page.
+* Bug - Issues with including JS repeatedly on an angularJS admin page. Clearing cache fixes it, but need a better solution.
+* Bug - Adjust datepicker so after selecting date, it hides. Good way to see how this gets annoying as is, is on the polls add page.
+* Bug - If an error is found when loading plugins in bootstrap, all cache is wiped.
+* Bug - Related to the previous one, major issue with opcache and multiple adapt sites - changed it so there is a prefix with a md5 hash of the script path, so cache is unique.

UPGRADE.md

@@ -42,23 +42,9 @@ After SQL is inserted, go into your admin panel and clear the cache. You should
 
 ####Issues?
 
-If you encounter a white page, enter in the following code on line 146 of <strong>app/Config/bootstrap.php</strong>:
-
-`
-clearCache(null, 'models');
-clearCache(null, 'persistent');
-clearCache(null, 'views');
-clearCache(null, '/../templates');
-
-if (function_exists('apc_clear_cache'))
-{
-    apc_clear_cache();
-    apc_clear_cache('user');
-    apc_clear_cache('opcode');
-}
-`
-
-Save and then load your site once and you should see it load normally. Remove that code and reload, everything should be resolved.
+If you encounter any issues, such as a blank white page or an internal server error - please submit a ticket:
+
+http://www.adaptcms.com/support
 
 3.0.1 - 3.0.2
 -------------

app/Config/bootstrap.php

@@ -144,7 +144,21 @@
 	'AdaptcmsCacheDispatcher'
 ));
 
-CakePlugin::loadAll();
+try {
+	CakePlugin::loadAll();
+} catch(Exception $e) {
+	clearCache(null, 'models');
+	clearCache(null, 'persistent');
+	clearCache(null, 'views');
+	clearCache(null, '/../templates');
+
+	if (function_exists('apc_clear_cache'))
+	{
+		apc_clear_cache();
+		apc_clear_cache('user');
+		apc_clear_cache('opcode');
+	}
+}
 
 require_once("config.php");
 

app/Config/core.php

@@ -246,7 +246,7 @@
 }
 
 // Prefix each application on the same server with a different string, to avoid Memcache and APC conflicts.
-$prefix = 'adaptcms_';
+$prefix = 'adaptcms_' . (!empty($_SERVER['SCRIPT_NAME']) ? md5($_SERVER['SCRIPT_NAME']) : '');
 
 /**
  * Configure the cache used for general framework caching.  Path information,

app/View/AdaptcmsView.php

@@ -135,7 +135,18 @@ public function render($view, $layout)
 	protected function _evaluate($viewFile, $dataForView) {
 		$viewFileModified = filemtime($viewFile);
 		$tempFile = str_replace(APP, '', $viewFile);
-		$tmpFile = strtolower(Inflector::slug($tempFile)) . '.tmp';
+
+		if (strstr(basename($tempFile), 'layout')) {
+			if ($this->disable_parsing) {
+				$append = '_1';
+			} else {
+				$append = '_0';
+			}
+		} else {
+			$append = '';
+		}
+
+		$tmpFile = strtolower(Inflector::slug($tempFile)) . $append . '.tmp';
 
 		$cache = TMP . 'templates' . DS;
 
@@ -248,7 +259,7 @@ public function _parse($file, $content)
 			$replace[] = $var;
 		}
 
-		if ($is_layout && !$this->disable_parsing) {
+		if ($is_layout) {
 			$headers = '
 <?php echo $this->Html->script("jquery.min") ?>
 <?php echo $this->Html->script("jquery.validate.min") ?>