From 7b200a2a642a78bffcf0a2f417a4757fb216ecfb Mon Sep 17 00:00:00 2001
From: Christopher Joe <cjoe@silverstripe.com>
Date: Tue, 29 Aug 2017 10:34:50 +1200
Subject: [PATCH] Fix add combinedFiles to clear logic

---
 view/Requirements.php | 45 ++++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/view/Requirements.php b/view/Requirements.php
index 971b943e4..a39d0e998 100644
--- a/view/Requirements.php
+++ b/view/Requirements.php
@@ -744,25 +744,24 @@ class Requirements_Backend {
 	 * @param string|int $fileOrID
 	 */
 	public function clear($fileOrID = null) {
-		if($fileOrID) {
-			foreach(array('javascript','css', 'customScript', 'customCSS', 'customHeadTags') as $type) {
-				if(isset($this->{$type}[$fileOrID])) {
+		$types = array(
+			'javascript',
+			'css',
+			'customScript',
+			'customCSS',
+			'customHeadTags',
+			'combine_files',
+		);
+		foreach ($types as $type) {
+			if ($fileOrID) {
+				if (isset($this->{$type}[$fileOrID])) {
 					$this->disabled[$type][$fileOrID] = $this->{$type}[$fileOrID];
 					unset($this->{$type}[$fileOrID]);
 				}
+			} else {
+				$this->disabled[$type] = $this->{$type};
+				$this->{$type} = array();
 			}
-		} else {
-			$this->disabled['javascript'] = $this->javascript;
-			$this->disabled['css'] = $this->css;
-			$this->disabled['customScript'] = $this->customScript;
-			$this->disabled['customCSS'] = $this->customCSS;
-			$this->disabled['customHeadTags'] = $this->customHeadTags;
-
-			$this->javascript = array();
-			$this->css = array();
-			$this->customScript = array();
-			$this->customCSS = array();
-			$this->customHeadTags = array();
 		}
 	}
 
@@ -770,11 +769,17 @@ class Requirements_Backend {
 	 * Restore requirements cleared by call to Requirements::clear
 	 */
 	public function restore() {
-		$this->javascript = $this->disabled['javascript'];
-		$this->css = $this->disabled['css'];
-		$this->customScript = $this->disabled['customScript'];
-		$this->customCSS = $this->disabled['customCSS'];
-		$this->customHeadTags = $this->disabled['customHeadTags'];
+		$types = array(
+			'javascript',
+			'css',
+			'customScript',
+			'customCSS',
+			'customHeadTags',
+			'combine_files',
+		);
+		foreach ($types as $type) {
+			$this->{$type} = $this->disabled[$type];
+		}
 	}
 	/**
 	 * Block inclusion of a specific file