From 3a48e5b09e322d036e4b4b02626b232534f60934 Mon Sep 17 00:00:00 2001
From: andrepereiradasilva <andrepereiradasilva@users.noreply.github.com>
Date: Sun, 14 Aug 2016 01:35:56 +0100
Subject: [PATCH] fix conflicts 1

---
 .../joomla/document/renderer/html/head.php    | 34 ++++++-------------
 1 file changed, 11 insertions(+), 23 deletions(-)

diff --git a/libraries/joomla/document/renderer/html/head.php b/libraries/joomla/document/renderer/html/head.php
index d7ae3a7676ddf..ff4ba444b7d47 100644
--- a/libraries/joomla/document/renderer/html/head.php
+++ b/libraries/joomla/document/renderer/html/head.php
@@ -187,35 +187,23 @@ public function fetchHead($document)
 		$defaultJsMimes = array('text/javascript', 'application/javascript', 'text/x-javascript', 'application/x-javascript');
 
 		// Generate script file links
-		foreach ($document->_scripts as $strSrc => $strAttribs)
+		foreach ($document->_scripts as $strSrc => $strAttr)
 		{
 			$buffer .= $tab . '<script src="' . $strSrc . '"';
 
-			// Add script tag attributes.
-			foreach ($strAttribs as $attrib => $value)
+			if (!is_null($strAttr['mime']) && (!$document->isHtml5() || !in_array($strAttr['mime'], $defaultJsMimes)))
 			{
-				// Don't add type attribute if document is HTML5 and it's a default mime type. 'mime' is for B/C.
-				if (in_array($attrib, array('type', 'mime')) && $document->isHtml5() && in_array($value, $defaultJsMimes))
-				{
-					continue;
-				}
-
-				// Don't add type attribute if document is HTML5 and it's a default mime type. 'mime' is for B/C.
-				if ($attrib === 'mime')
-				{
-					$attrib = 'type';
-				}
-				// B/C defer and async can be set to yes when using the old method.
-				elseif (in_array($attrib, array('defer', 'async')) && $value === true)
-				{
-					$value = $attrib;
-				}
+				$buffer .= ' type="' . $strAttr['mime'] . '"';
+			}
 
-				// Json encode value if it's an array.
-				$value = !is_scalar($value) ? json_encode($value) : $value;
+			if ($strAttr['defer'])
+			{
+				$buffer .= ' defer="defer"';
+			}
 
-				// Add attribute to script tag output.
-				$buffer .= ' ' . htmlspecialchars($attrib, ENT_COMPAT, 'UTF-8') . '="' . htmlspecialchars($value, ENT_COMPAT, 'UTF-8') . '"';
+			if ($strAttr['async'])
+			{
+				$buffer .= ' async="async"';
 			}
 
 			$buffer .= '></script>' . $lnEnd;