Merge branch 'release/4.2.4'

* release/4.2.4: updates the changelog patch for the canonical link bug #508
austintoddj · Jun 12, 2019 · c418c69 · c418c69
2 parents e9c864d + 6151619
commit c418c69
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 7 deletions.
diff --git a/changelog.md b/changelog.md
@@ -2,6 +2,11 @@
 
 ## [Unreleased](https://github.com/cnvs/canvas/compare/master...develop)
 
+## [4.2.4](https://github.com/cnvs/canvas/compare/v4.2.3...v4.2.4)
+
+## Fixed
+- Patch for the canonical link causing an undefined index ([#508](https://github.com/cnvs/canvas/issues/508), [3a45bc7](https://github.com/cnvs/canvas/commit/3a45bc7136728bfddeed945b2ac1e2dff5bca7a2))
+
 ## [4.2.3](https://github.com/cnvs/canvas/compare/v4.2.2...v4.2.3)
 
 ## Changed

diff --git a/resources/views/components/modals/post/edit/seo.blade.php b/resources/views/components/modals/post/edit/seo.blade.php
@@ -44,14 +44,16 @@ class="form-control border-0 px-0"
                                   title="{{ __('canvas::posts.forms.seo.twitter.description.label') }}">{{ $data['meta']['twitter_description'] }}</textarea>
                     </div>
                 </div>
-                <div class="form-group row">
-                    <div class="col-12">
-                        <label for="canonical_link" class="font-weight-bold">{{ __('canvas::posts.forms.seo.canonical.label') }}</label>
-                        <input type="text" class="form-control border-0 px-0"
-                               name="canonical_link" title="{{ __('canvas::posts.forms.seo.canonical.label') }}" value="{{ $data['meta']['canonical_link'] }}"
-                               placeholder="{{ __('canvas::posts.forms.seo.canonical.placeholder') }}">
+                @isset($data['meta']['canonical_link'])
+                    <div class="form-group row">
+                        <div class="col-12">
+                            <label for="canonical_link" class="font-weight-bold">{{ __('canvas::posts.forms.seo.canonical.label') }}</label>
+                            <input type="text" class="form-control border-0 px-0"
+                                   name="canonical_link" title="{{ __('canvas::posts.forms.seo.canonical.label') }}" value="{{ $data['meta']['canonical_link'] }}"
+                                   placeholder="{{ __('canvas::posts.forms.seo.canonical.placeholder') }}">
+                        </div>
                     </div>
-                </div>
+                @endisset
             </div>
             <div class="modal-footer">
                 <button class="btn btn-link text-muted" data-dismiss="modal">{{ __('canvas::buttons.general.done') }}</button>