Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[5.3] Add greeting option to SimpleMessage notification #15108

Merged
merged 7 commits into from
Aug 28, 2016
Merged

[5.3] Add greeting option to SimpleMessage notification #15108

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
cef7017
Add greeting option to SimpleMessage notification
balping Aug 28, 2016
f7423cd
Add missing new line
balping Aug 28, 2016
a4090a3
Revert new line that casuses styleci failing
balping Aug 28, 2016
0e193ea
Remove nested ternary
balping Aug 28, 2016
8da2c77
Replace tabs with spaces
balping Aug 28, 2016
5c515a8
Add extra space
balping Aug 28, 2016
6421e33
Nah this should pass finally
balping Aug 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove nested ternary
  • Loading branch information
@balping
balping committed Aug 28, 2016
commit 0e193eaa648ae7c7e60eca806551fe9f8627d231
9 changes: 8 additions & 1 deletion src/Illuminate/Notifications/resources/views/email-plain.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
{{ ( $greeting !== null ) ? $greeting : ($level == 'error' ? 'Whoops!' : 'Hello!') }}
<?php
if( $greeting !== null ) {
echo e($greeting);
} else {
echo $level == 'error' ? 'Whoops!' : 'Hello!';
}

?>

<?php

Expand Down