Merge pull request #635 from ChristianGiupponi/master

Possibile fix for alternate variable not set in page

Modules/Core/Http/Controllers/BasePublicController.php

@@ -13,10 +13,25 @@ abstract class BasePublicController extends Controller
      */
     protected $auth;
     public $locale;
+    public $alternateUrls = [];
 
     public function __construct()
     {
         $this->locale = App::getLocale();
         $this->auth = app(Authentication::class);
+        view()->share('alternate', $this->alternateUrls);
     }
+
+    /**
+     * Add alternate URLs to main array and inject it to the page
+     *
+     * @param array $alternateUrls
+     * @return void
+     */
+    protected function addAlternateUrls(array $alternateUrls)
+    {
+        $this->alternateUrls = array_merge($this->alternateUrls, $alternateUrls);
+        view()->share('alternate', $this->alternateUrls);
+    }
+}
 }

Modules/Page/Http/Controllers/PublicController.php

@@ -46,9 +46,9 @@ class PublicController extends BasePublicController
 
         $template = $this->getTemplateForPage($page);
 
-        $alternate = $this->getAlternateMetaData($page);
+        $this->addAlternateUrls($this->getAlternateMetaData($page));
 
-        return view($template, compact('page', 'alternate'));
+        return view($template, compact('page'));
     }
 
     /**
@@ -62,9 +62,9 @@ class PublicController extends BasePublicController
 
         $template = $this->getTemplateForPage($page);
 
-        $alternate = $this->getAlternateMetaData($page);
+        $this->addAlternateUrls($this->getAlternateMetaData($page));
 
-        return view($template, compact('page', 'alternate'));
+        return view($template, compact('page'));
     }
 
     /**

Themes/Flatly/views/layouts/master.blade.php

@@ -7,9 +7,11 @@
     @show
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>@section('title')@setting('core::site-name')@show</title>
-    @foreach($alternate as $alternateLocale=>$alternateSlug)
-        <link rel="alternate" hreflang="{{$alternateLocale}}" href="{{url($alternateLocale.'/'.$alternateSlug)}}">
-    @endforeach
+    @if(isset($alternate))
+        @foreach($alternate as $alternateLocale=>$alternateSlug)
+            <link rel="alternate" hreflang="{{$alternateLocale}}" href="{{url($alternateLocale.'/'.$alternateSlug)}}">
+        @endforeach
+    @endif
     <link rel="canonical" href="{{url()->current()}}" />
     <link rel="shortcut icon" href="{{ Theme::url('favicon.ico') }}">