Skip to content

Commit

Permalink
Use @Isset directive (#18817)
Browse files Browse the repository at this point in the history
  • Loading branch information
tillkruss authored and taylorotwell committed Apr 17, 2017
1 parent 1660cee commit 7c283c2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions src/Illuminate/Mail/resources/views/html/message.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
{{ $slot }}

{{-- Subcopy --}}
@if (isset($subcopy))
@isset($subcopy)
@slot('subcopy')
@component('mail::subcopy')
{{ $subcopy }}
@endcomponent
@endslot
@endif
@endisset

{{-- Footer --}}
@slot('footer')
Expand Down
4 changes: 2 additions & 2 deletions src/Illuminate/Mail/resources/views/markdown/layout.blade.php
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{!! strip_tags($header) !!}

{!! strip_tags($slot) !!}
@if (isset($subcopy))
@isset($subcopy)

{!! strip_tags($subcopy) !!}
@endif
@endisset

{!! strip_tags($footer) !!}
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
{{ $slot }}

{{-- Subcopy --}}
@if (isset($subcopy))
@isset($subcopy)
@slot('subcopy')
@component('mail::subcopy')
{{ $subcopy }}
@endcomponent
@endslot
@endif
@endisset

{{-- Footer --}}
@slot('footer')
Expand Down
8 changes: 4 additions & 4 deletions src/Illuminate/Notifications/resources/views/email.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
@endforeach

{{-- Action Button --}}
@if (isset($actionText))
@isset($actionText)
<?php
switch ($level) {
case 'success':
Expand All @@ -33,7 +33,7 @@
@component('mail::button', ['url' => $actionUrl, 'color' => $color])
{{ $actionText }}
@endcomponent
@endif
@endisset

{{-- Outro Lines --}}
@foreach ($outroLines as $line)
Expand All @@ -49,10 +49,10 @@
@endif

<!-- Subcopy -->
@if (isset($actionText))
@isset($actionText)
@component('mail::subcopy')
If you’re having trouble clicking the "{{ $actionText }}" button, copy and paste the URL below
into your web browser: [{{ $actionUrl }}]({{ $actionUrl }})
@endcomponent
@endif
@endisset
@endcomponent

0 comments on commit 7c283c2

Please sign in to comment.