Merge pull request #22 from markhuot/fix-default-admin

don't assume "admin" trigger
markhuot · Apr 12, 2024 · 4b25d82 · 4b25d82
2 parents 4ab8e97 + 27d9ccc
commit 4b25d82
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/composer.json b/composer.json
@@ -53,7 +53,7 @@
     "prefer-stable": true,
     "require-dev": {
         "craftcms/phpstan": "dev-main",
-        "craftcms/craft": "^2.0",
+        "craftcms/craft": "^4.0",
         "symfony/var-dumper": "^5.0|^6.0",
         "laravel/pint": "^1.13"
     }

diff --git a/src/http/requests/WebRequest.php b/src/http/requests/WebRequest.php
@@ -161,7 +161,7 @@ public function setDefaultProperties(string $url)
     protected function uriContainsAdminSlug(string $uri): bool
     {
         $path = parse_url($uri, PHP_URL_PATH);
-        $slug = \Craft::$app->getConfig()->getGeneral()->cpTrigger ?? 'admin';
+        $slug = \Craft::$app->getConfig()->getGeneral()->cpTrigger;
 
         return str_starts_with(ltrim($path, '/'), $slug);
     }