tonyair/silverstripe-subsites
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-subsites synced 2024-06-26 06:29:31 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #395 from DorsetDigital/patch-1

Browse Source 
Change source of admin URL in getIsAdmin()
This commit is contained in:
Robbie Averill 2018-10-18 11:02:46 +02:00 committed by GitHub
commit 6a8f15a194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Middleware/InitStateMiddleware.php
View File

@ -62,7 +62,7 @@ class InitStateMiddleware implements HTTPMiddleware
public function getIsAdmin(HTTPRequest $request) public function getIsAdmin(HTTPRequest $request)
{ {
$adminPaths = static::config()->get('admin_url_paths'); $adminPaths = static::config()->get('admin_url_paths');
$adminPaths[] = AdminRootController::config()->get('url_base') . '/'; $adminPaths[] = AdminRootController::admin_url();
$currentPath = rtrim($request->getURL(), '/') . '/'; $currentPath = rtrim($request->getURL(), '/') . '/';
foreach ($adminPaths as $adminPath) { foreach ($adminPaths as $adminPath) {
if (substr($currentPath, 0, strlen($adminPath)) === $adminPath) { if (substr($currentPath, 0, strlen($adminPath)) === $adminPath) {