c-cms/c-cms-legacy
1
0
Fork 0
mirror of https://gitlab.com/TheGamecraft/c-cms.git synced 2026-04-25 20:29:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

ALPHA 3.0.2a

Browse Source
This commit is contained in:
TheGamecraft
2018-09-10 08:51:18 -04:00
parent 7fe13ae0a7
commit 0e0ef86b71
1404 changed files with 10604 additions and 33714 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/laravel/framework/src/Illuminate/Mail/Mailable.php vendored
View File

@@ -157,7 +157,7 @@ class Mailable implements MailableContract, Renderable
*/
public function queue(Queue $queue)
{
if (property_exists($this, 'delay')) {
if (isset($this->delay)) {
return $this->later($this->delay, $queue);
}
@@ -212,7 +212,7 @@ class Mailable implements MailableContract, Renderable
if (isset($this->html)) {
return array_filter([
'html' => new HtmlString($this->html),
'text' => isset($this->textView) ? $this->textView : null,
'text' => $this->textView ?? null,
]);
}

4
vendor/laravel/framework/src/Illuminate/Mail/Mailer.php vendored
View File

@@ -236,7 +236,7 @@ class Mailer implements MailerContract, MailQueueContract
// message. This is primarily useful during local development in which each
// message should be delivered into a single mail address for inspection.
if (isset($this->to['address'])) {
$this->setGlobalTo($message);
$this->setGlobalToAndRemoveCcAndBcc($message);
}
// Next we will determine if the message should be sent. We give the developer
@@ -347,7 +347,7 @@ class Mailer implements MailerContract, MailQueueContract
* @param \Illuminate\Mail\Message $message
* @return void
*/
protected function setGlobalTo($message)
protected function setGlobalToAndRemoveCcAndBcc($message)
{
$message->to($this->to['address'], $this->to['name'], true);
$message->cc(null, null, true);

2
vendor/laravel/framework/src/Illuminate/Mail/resources/views/html/message.blade.php vendored
View File

@@ -21,7 +21,7 @@
{{-- Footer --}}
@slot('footer')
@component('mail::footer')
© {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
@endcomponent
@endslot
@endcomponent

2
vendor/laravel/framework/src/Illuminate/Mail/resources/views/markdown/message.blade.php vendored
View File

@@ -21,7 +21,7 @@
{{-- Footer --}}
@slot('footer')
@component('mail::footer')
© {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
© {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
@endcomponent
@endslot
@endcomponent