mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX: Ticket #2327 - Merged patch fixing regex problem in Director::protocolAndHost()
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53194 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
130ead34cd
commit
a12cf06cc8
@ -269,7 +269,7 @@ class Director {
|
|||||||
*/
|
*/
|
||||||
static function protocolAndHost() {
|
static function protocolAndHost() {
|
||||||
if(self::$alternateBaseURL) {
|
if(self::$alternateBaseURL) {
|
||||||
if(preg_match('/^(http[^:]*:\/\/[^/]+)\//1', self::$alternateBaseURL, $matches)) {
|
if(preg_match('/^(http[^:]*:\/\/[^\/]+)\//', self::$alternateBaseURL, $matches)) {
|
||||||
return $matches[1];
|
return $matches[1];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user