Merge pull request #16 from bnomei/master

php 8 and kirby3.7
sylvainjule · Aug 3, 2022 · 78cb666 · 78cb666
2 parents 9c2a624 + 33f1603
commit 78cb666
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/index.php b/index.php
@@ -12,7 +12,7 @@
     'hooks'    => [
         'panel.route:before' => function($route, $path, $method) {
             $user  = kirby()->user();
-            if(!$user) return;
+            if(!$user || !$path) return;
 
             if (str_starts_with($path, "dialogs")
                 || str_starts_with($path, "dropdowns")

diff --git a/lib/bouncer.php b/lib/bouncer.php
@@ -13,7 +13,7 @@ public static function getAllowedPages($user, $fieldname, $extra = false) {
             foreach($pages as $page) {
                 $allowed[] = [
                     'title' => $page->title()->value(),
-                    'path'  => $page->panelUrl(true)
+                    'path'  => $page->panel()->url(true)
                 ];
 
                 $children = $extra ? static::getChildren($page) : [];
@@ -44,7 +44,7 @@ private static function getChildren(Kirby\Cms\Page $page) {
         foreach($pages as $p) {
             $allowed[] = [
                 'title' => $p->title()->value(),
-                'path'  => $p->panelUrl(true)
+                'path'  => $p->panel()->url(true)
             ];
 
             $children = static::getChildren($p);