diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php index 505e04d4d85..fa9a76f5ed5 100644 --- a/lib/outputcomponents.php +++ b/lib/outputcomponents.php @@ -2089,12 +2089,10 @@ class html_writer { */ public static function script($jscode, $url=null) { if ($jscode) { - $attributes = array('type'=>'text/javascript'); - return self::tag('script', "\n//\n", $attributes) . "\n"; + return self::tag('script', "\n//\n") . "\n"; } else if ($url) { - $attributes = array('type'=>'text/javascript', 'src'=>$url); - return self::tag('script', '', $attributes) . "\n"; + return self::tag('script', '', ['src' => $url]) . "\n"; } else { return ''; diff --git a/lib/outputrequirementslib.php b/lib/outputrequirementslib.php index 3eb24e2b680..89bca869e3a 100644 --- a/lib/outputrequirementslib.php +++ b/lib/outputrequirementslib.php @@ -1467,14 +1467,14 @@ class page_requirements_manager { ); if ($this->yui3loader->combine) { - return ''; } else { $code = ''; foreach ($baserollups as $rollup) { - $code .= ''; + $code .= ''; } return $code; }