From 01989aac4e42cc6547c72576b276e017c3d2a8f5 Mon Sep 17 00:00:00 2001
From: Jonathon Menz <jonomenz@gmail.com>
Date: Tue, 25 Nov 2014 10:27:42 +1030
Subject: [PATCH] FIX: Manifest flushing

Fixes silverstripe/silverstripe-framework#2325
Fixes silverstripe/silverstripe-framework#3093

Static manifest was not being flushed during a dev/build on some environments (without ?flush in URL) and template manifest was never being flushed during a dev/build.
---
 core/Core.php                      | 13 +++++++------
 core/manifest/TemplateManifest.php |  9 +++++----
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/core/Core.php b/core/Core.php
index 13f15a0b4..df2c7f802 100644
--- a/core/Core.php
+++ b/core/Core.php
@@ -95,9 +95,9 @@ Injector::set_inst($injector);
 // Regenerate the manifest if ?flush is set, or if the database is being built.
 // The coupling is a hack, but it removes an annoying bug where new classes
 // referenced in _config.php files can be referenced during the build process.
-$flush = (isset($_GET['flush']) || isset($_REQUEST['url']) && (
-	$_REQUEST['url'] == 'dev/build' || $_REQUEST['url'] == BASE_URL . '/dev/build'
-));
+$requestURL = isset($_REQUEST['url']) ? trim($_REQUEST['url'], '/') : false;
+$flush = (isset($_GET['flush']) || $requestURL == 'dev/build' || $requestURL == BASE_URL . '/dev/build');
+
 global $manifest;
 $manifest = new SS_ClassManifest(BASE_PATH, false, $flush);
 
@@ -111,16 +111,17 @@ if(file_exists(BASE_PATH . '/vendor/autoload.php')) {
 	require_once BASE_PATH . '/vendor/autoload.php';
 }
 
-// Now that the class manifest is up, load the configuration
+// Now that the class manifest is up, load the static configuration
 $configManifest = new SS_ConfigStaticManifest(BASE_PATH, false, $flush);
 Config::inst()->pushConfigStaticManifest($configManifest);
 
-// Now that the class manifest is up, load the configuration
+// And then the yaml configuration
 $configManifest = new SS_ConfigManifest(BASE_PATH, false, $flush);
 Config::inst()->pushConfigYamlManifest($configManifest);
 
+// Load template manifest
 SS_TemplateLoader::instance()->pushManifest(new SS_TemplateManifest(
-	BASE_PATH, project(), false, isset($_GET['flush'])
+	BASE_PATH, project(), false, $flush
 ));
 
 // If in live mode, ensure deprecation, strict and notices are not reported
diff --git a/core/manifest/TemplateManifest.php b/core/manifest/TemplateManifest.php
index 5e9f4a10c..7a7649482 100644
--- a/core/manifest/TemplateManifest.php
+++ b/core/manifest/TemplateManifest.php
@@ -16,7 +16,6 @@ class SS_TemplateManifest {
 	protected $cacheKey;
 	protected $project;
 	protected $inited;
-	protected $forceRegen;
 	protected $templates = array();
 
 	/**
@@ -39,8 +38,10 @@ class SS_TemplateManifest {
 
 		$this->cache = new $cacheClass('templatemanifest'.($includeTests ? '_tests' : ''));
 		$this->cacheKey = $this->getCacheKey($includeTests);
-
-		$this->forceRegen = $forceRegen;
+		
+		if ($forceRegen) {
+			$this->regenerate();
+		}
 	}
 
 	/**
@@ -208,7 +209,7 @@ class SS_TemplateManifest {
 	}
 
 	protected function init() {
-		if (!$this->forceRegen && $data = $this->cache->load($this->cacheKey)) {
+		if ($data = $this->cache->load($this->cacheKey)) {
 			$this->templates = $data;
 			$this->inited    = true;
 		} else {