diff --git a/lib/outputcomponents.php b/lib/outputcomponents.php
index 91c0a54e73a2f..6675c831c71e4 100644
--- a/lib/outputcomponents.php
+++ b/lib/outputcomponents.php
@@ -2062,12 +2062,10 @@ public static function input_hidden_params(moodle_url $url, array $exclude = nul
*/
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 bab8815e144d2..2128577c38b00 100644
--- a/lib/outputrequirementslib.php
+++ b/lib/outputrequirementslib.php
@@ -1445,14 +1445,14 @@ protected function get_yui3lib_headcode() {
);
if ($this->yui3loader->combine) {
- return '';
} else {
$code = '';
foreach ($baserollups as $rollup) {
- $code .= '';
+ $code .= '';
}
return $code;
}