From 1a68d6e7e1aae8fd420c1902456760d285b3090c Mon Sep 17 00:00:00 2001
From: Simon Coggins <simon.coggins@totaralms.com>
Date: Tue, 12 Aug 2014 14:06:37 +1200
Subject: [PATCH] MDL-46775: Fix call to unavailable function when loading an
 invalid JS file

---
 lib/javascript.php   | 6 ++++--
 theme/javascript.php | 3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/lib/javascript.php b/lib/javascript.php
index efc172e52a9..0cb40672e3f 100644
--- a/lib/javascript.php
+++ b/lib/javascript.php
@@ -35,7 +35,8 @@ require_once("$CFG->dirroot/lib/classes/minify.php");
 if ($slashargument = min_get_slash_argument()) {
     $slashargument = ltrim($slashargument, '/');
     if (substr_count($slashargument, '/') < 1) {
-        image_not_found();
+        header('HTTP/1.0 404 not found');
+        die('Slash argument must contain both a revision and a file path');
     }
     // image must be last because it may contain "/"
     list($rev, $file) = explode('/', $slashargument, 2);
@@ -73,7 +74,8 @@ foreach ($files as $fsfile) {
 
 if (!$jsfiles) {
     // bad luck - no valid files
-    die();
+    header('HTTP/1.0 404 not found');
+    die('No valid javascript files found');
 }
 
 $etag = sha1($rev.implode(',', $jsfiles));
diff --git a/theme/javascript.php b/theme/javascript.php
index e1b9606e0e3..c6bda484fb8 100644
--- a/theme/javascript.php
+++ b/theme/javascript.php
@@ -35,7 +35,8 @@ require_once("$CFG->dirroot/lib/jslib.php");
 if ($slashargument = min_get_slash_argument()) {
     $slashargument = ltrim($slashargument, '/');
     if (substr_count($slashargument, '/') < 2) {
-        image_not_found();
+        header('HTTP/1.0 404 not found');
+        die('Slash argument must contain both a revision and a file path');
     }
     // image must be last because it may contain "/"
     list($themename, $rev, $type) = explode('/', $slashargument, 3);