moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 09:26:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'w12_MDL-31703_m23_rootdirroot' of git://github.com/skodak/moodle

Browse source
This commit is contained in:
Sam Hemelryk 2012-03-19 20:16:34 +13:00
commit 2cd97ff3c5
1 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/javascript.php
View file

@ -46,7 +46,11 @@ foreach ($files as $fsfile) {
// does not exist
continue;
}
if (strpos($jsfile, $CFG->dirroot . DIRECTORY_SEPARATOR) !== 0) {
if ($CFG->dirroot === '/') {
// Some shared hosting sites serve files directly from '/',
// this is NOT supported, but at least allow JS when showing
// errors and warnings.
} else if (strpos($jsfile, $CFG->dirroot . DIRECTORY_SEPARATOR) !== 0) {
// hackers - not in dirroot
continue;
}