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

Merge branch '3.5' into 3

Browse Source
This commit is contained in:
Daniel Hensby 2016-12-15 11:59:54 +00:00
commit 4a6fe3c375
No known key found for this signature in database
GPG Key ID: 229831A941962E26
2 changed files with 2 additions and 6 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));
}
}
}

4
view/Requirements.php
View File

@ -1359,8 +1359,6 @@ class Requirements_Backend {
$this->css($theme . $css, $media);
} elseif($module) {
$this->css($module . $css, $media);
} else {
throw new InvalidArgumentException("The css file doesn't exists. Please check if the file $name.css exists in any context or search for themedCSS references calling this file in your templates.");
}
}
@ -1393,8 +1391,6 @@ class Requirements_Backend {
$this->javascript($theme . $js);
} elseif($module) {
$this->javascript($module . $js);
} else {
throw new InvalidArgumentException("The javascript file doesn't exists. Please check if the file $name.js exists in any context or search for themedJavascript references calling this file in your templates.");
}
}