deprecation notice on missing cpTrigger strings

markhuot · Sep 30, 2024 · a86b849 · a86b849
1 parent 80b5d8a
commit a86b849
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/http/requests/WebRequest.php b/src/http/requests/WebRequest.php
@@ -132,8 +132,9 @@ public function setDefaultProperties(string $url)
         }
 
         $isCpRequest = $this->uriContainsAdminSlug($uri);
-        if ($isCpRequest) {
-            $uri = preg_replace('#^'.preg_quote(\Craft::$app->getConfig()->getGeneral()->cpTrigger).'/?#', '', $uri);
+        $cpTrigger = \Craft::$app->getConfig()->getGeneral()->cpTrigger;
+        if ($isCpRequest && $cpTrigger) {
+            $uri = preg_replace('#^'.preg_quote($cpTrigger).'/?#', '', $uri);
         }
 
         $this->setRaw([
@@ -161,7 +162,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;
+        $slug = \Craft::$app->getConfig()->getGeneral()->cpTrigger ?? '';
 
         return str_starts_with(ltrim($path, '/'), $slug);
     }