tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6401 from andrewandante/HOTFIX/namespace-IPUtils-correctly-3.5

Browse Source 
remove FRAMEWORK_PATH and namespace IPUtils
This commit is contained in:
Daniel Hensby 2016-12-15 11:51:40 +00:00 committed by GitHub
commit 68ce7b538b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/Constants.php
View File

@ -106,9 +106,9 @@ if(!defined('TRUSTED_PROXY')) {
$trusted = true;
} elseif(isset($_SERVER['REMOTE_ADDR'])) {
if(!class_exists('SilverStripe\\Control\\Util\\IPUtils')) {
require_once FRAMEWORK_PATH . '/control/IPUtils.php';
require_once 'control/IPUtils.php';
};
$trusted = IPUtils::checkIP($_SERVER['REMOTE_ADDR'], explode(',', SS_TRUSTED_PROXY_IPS));
$trusted = SilverStripe\Control\Util\IPUtils::checkIP($_SERVER['REMOTE_ADDR'], explode(',', SS_TRUSTED_PROXY_IPS));
}
}
}