L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'w31_MDL-28382_m21_iis' of git://github.com/skodak/moodle into MOODLE_21_STABLE

Browse Source
This commit is contained in:
Sam Hemelryk
2011-08-08 10:20:57 +08:00
parent 31b4fdabbf c2edea7cbd
commit 6b9c6cc54e
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme/yui_combo.php
+13 -9
View File
@@ -161,23 +161,27 @@ function combo_send_uncached($content, $mimetype) {
die;
}
function combo_not_found() {
function combo_not_found($message = '') {
header('HTTP/1.0 404 not found');
die('Combo resource not found, sorry.');
if ($message) {
echo $message;
} else {
echo 'Combo resource not found, sorry.';
}
die;
}
function combo_params() {
if (!empty($_SERVER['REQUEST_URI'])) {
$parts = explode('?', $_SERVER['REQUEST_URI']);
if (count($parts) != 2) {
return '';
}
// note: buggy or misconfigured IIS does return the query string in REQUEST_URL
if (isset($_SERVER['REQUEST_URI']) and strpos($_SERVER['REQUEST_URI'], '?') !== false) {
$parts = explode('?', $_SERVER['REQUEST_URI'], 2);
return $parts[1];
} else if (!empty($_SERVER['QUERY_STRING'])) {
} else if (isset($_SERVER['QUERY_STRING'])) {
return $_SERVER['QUERY_STRING'];
} else {
return '';
// unsupported server, sorry!
combo_not_found('Unsupported server - query string can not be determined, try disabling YUI combo loading in admin settings.');
}
}