Add asset to includedAssets after url is resolved

Author: Walther Lalk

src/View/Helper/HtmlHelper.php

@@ -91,10 +91,7 @@ class HtmlHelper extends Helper {
  *
  * @var array
  */
-	protected $_includedAssets = array(
-		'css' => array(),
-		'script' => array()
-	);
+	protected $_includedAssets = array();
 
 /**
  * Options for the currently opened script block buffer if any.
@@ -408,19 +405,19 @@ public function css($path, array $options = array()) {
 			return;
 		}
 
-		if ($options['once'] && isset($this->_includedAssets['css'][$path])) {
-			return '';
-		}
-		unset($options['once']);
-		$this->_includedAssets['css'][$path] = true;
-
 		if (strpos($path, '//') !== false) {
 			$url = $path;
 		} else {
 			$url = $this->assetUrl($path, $options + array('pathPrefix' => Configure::read('App.cssBaseUrl'), 'ext' => '.css'));
 			$options = array_diff_key($options, array('fullBase' => null, 'pathPrefix' => null));
 		}
 
+		if ($options['once'] && isset($this->_includedAssets[$url])) {
+			return '';
+		}
+		unset($options['once']);
+		$this->_includedAssets[$url] = true;
+
 		if ($options['rel'] === 'import') {
 			$out = $this->formatTemplate('style', [
 				'attrs' => $this->templater()->formatAttributes($options, ['rel', 'block']),
@@ -492,15 +489,17 @@ public function script($url, array $options = array()) {
 			}
 			return null;
 		}
-		if ($options['once'] && isset($this->_includedAssets['script'][$url])) {
-			return null;
-		}
-		$this->_includedAssets['script'][$url] = true;
 
 		if (strpos($url, '//') === false) {
 			$url = $this->assetUrl($url, $options + array('pathPrefix' => Configure::read('App.jsBaseUrl'), 'ext' => '.js'));
 			$options = array_diff_key($options, array('fullBase' => null, 'pathPrefix' => null));
 		}
+
+		if ($options['once'] && isset($this->_includedAssets[$url])) {
+			return null;
+		}
+		$this->_includedAssets[$url] = true;
+
 		$out = $this->formatTemplate('javascriptlink', [
 			'url' => $url,
 			'attrs' => $this->templater()->formatAttributes($options, ['block', 'once']),

tests/TestCase/View/Helper/HtmlHelperTest.php

@@ -515,7 +515,7 @@ public function testCssLink() {
 		);
 		$this->assertTags($result, $expected);
 
-		$result = $this->Html->css('screen.css');
+		$result = $this->Html->css('screen.css', array('once' => false));
 		$this->assertTags($result, $expected);
 
 		Plugin::load('TestPlugin');