Merge branch 'MDL-47214-master' of github.com:andrewnicols/moodle

This commit is contained in:
Dan Poltawski 2014-10-01 08:37:43 +01:00
commit f2a8ecfae9

View File

@ -8630,7 +8630,7 @@ function getremoteaddr($default='0.0.0.0') {
if (!($variablestoskip & GETREMOTEADDR_SKIP_HTTP_X_FORWARDED_FOR)) {
if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
$hdr = explode(",", $_SERVER['HTTP_X_FORWARDED_FOR']);
$address = $hdr[0];
$address = cleanremoteaddr($hdr[0]);
return $address ? $address : $default;
}
}