wip #6498

diff --git a/composer.json b/composer.json
index 56ffbe65cb985240bb00b153cf18cfd7134977c8..f767b7c65d1e07ac8d70ba10a80f6ca1e6d64c8a 100644 (file)
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
   ],
   "require": {
     "php": ">=7.1.3",
-    "laravel/framework": "^5.8",
+    "laravel/framework": "^v6.20.44",
     "spatie/laravel-sitemap": "^5.2",
     "spatie/laravel-missing-page-redirector": "^2.3",
     "spatie/laravel-googletagmanager": "^2.6",

diff --git a/resources/views/head/meta.blade.php b/resources/views/head/meta.blade.php
index 80ed68e52c03a322a2d2a562daef15edb6b640b8..fc5bfdcbb859c09c6494b4fe1433cd911e06d368 100644 (file)
--- a/resources/views/head/meta.blade.php
+++ b/resources/views/head/meta.blade.php
@@ -3,14 +3,17 @@
     $page_short_title=$page->getEntity()->getSearchShortTitle();
 
     if($search_enabled){
-        $search_breadcrumbs=CubistMenu::getSearchBreadcrumbs();
+        try{
+            $search_breadcrumbs=CubistMenu::getSearchBreadcrumbs();
+            $search_page= $page->get('search_internal_enabled','1');
+            $search_keywords=implode(' ',$page->get('search_internal_keywords',[]));
+            $search_short_title=$page_short_title;
 
-        $search_page= $page->get('search_internal_enabled','1');
-        $search_keywords=implode(' ',$page->get('search_internal_keywords',[]));
-        $search_short_title=$page_short_title;
-
-        $t=explode('\\',get_class($page->getEntity()));
-        $type=mb_strtolower(array_pop($t));
+            $t=explode('\\',get_class($page->getEntity()));
+            $type=mb_strtolower(array_pop($t));
+        }catch (Exception $e){
+            $search_enabled =false;
+        }
     }
 @endphp
 <title>{{ $page->getMetaLongTitle() }}</title>
@@ -21,7 +24,9 @@
 <meta name="robots" content="{{ $page->getRobots() }}">
 @stack('head.meta')
 @if($search_enabled)
-<meta data-search="{{ $search_page }}" data-keywords="{{ $search_keywords }}" data-short-title="{{ $search_short_title }}" data-type="{{ $type }}" data-breadcrumbs='@json($search_breadcrumbs)'>
+    <meta data-search="{{ $search_page }}" data-keywords="{{ $search_keywords }}"
+          data-short-title="{{ $search_short_title }}" data-type="{{ $type }}"
+          data-breadcrumbs='@json($search_breadcrumbs)'>
 @endif
 @include('cubist::head.social')
 <meta name="csrf-token" content="{{ csrf_token() }}">