MDL-9798 fallback to html mimetype when missing index.php, index.html; merged from...

diff --git a/user/policy.php b/user/policy.php
index f43a99f6083921ea8ba875e44e540ac62298bfaf..7950755e7532039ae258d18770d443d9d9f0a32c 100644 (file)
--- a/user/policy.php
+++ b/user/policy.php
@@ -38,6 +38,11 @@
     print_heading($strpolicyagreement);
 
     $mimetype = mimeinfo('type', $CFG->sitepolicy);
+    if ($mimetype == 'document/unknown') {
+        //fallback for missing index.php, index.html
+        $mimetype = 'text/html';
+    }
+
     echo '<div class="noticebox">';
     echo '<object id="policyframe" data="'.$CFG->sitepolicy.'" type="'.$mimetype.'">';
     echo link_to_popup_window ($CFG->sitepolicy, 'agreement', $strpolicyagreementclick,