From 26609f5f65c7d57f6b4ced7b49c77bfef0516f70 Mon Sep 17 00:00:00 2001 From: Brian Detweiler Date: Thu, 13 Oct 2016 13:50:51 -0600 Subject: [PATCH 1/6] Update MailServiceProvider.php removed commented line to override wordpress email --- src/LaraPress/Mail/MailServiceProvider.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LaraPress/Mail/MailServiceProvider.php b/src/LaraPress/Mail/MailServiceProvider.php index 5923ed5..46b1af4 100644 --- a/src/LaraPress/Mail/MailServiceProvider.php +++ b/src/LaraPress/Mail/MailServiceProvider.php @@ -15,7 +15,7 @@ public function register() { if (config('mail.override_wordpress', false)) { - //include(__DIR__ . '/wp_mail.php'); + include(__DIR__ . '/wp_mail.php'); } } -} \ No newline at end of file +} From 1942c36e196d13301330c43640132f32e762b79f Mon Sep 17 00:00:00 2001 From: Jeff Berry Date: Thu, 13 Oct 2016 16:20:58 -0600 Subject: [PATCH 2/6] Create email.blade.php --- src/resources/views/email.blade.php | 1 + 1 file changed, 1 insertion(+) create mode 100644 src/resources/views/email.blade.php diff --git a/src/resources/views/email.blade.php b/src/resources/views/email.blade.php new file mode 100644 index 0000000..0e9c7db --- /dev/null +++ b/src/resources/views/email.blade.php @@ -0,0 +1 @@ +{!! $content !!} From f44658e57a10af01e21ea017c1a774c237bc1c7b Mon Sep 17 00:00:00 2001 From: Jeff Berry Date: Thu, 13 Oct 2016 16:21:37 -0600 Subject: [PATCH 3/6] Update SupportServiceProvider.php --- .../Foundation/Providers/SupportServiceProvider.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/LaraPress/Foundation/Providers/SupportServiceProvider.php b/src/LaraPress/Foundation/Providers/SupportServiceProvider.php index baf5ae3..7cc87b5 100644 --- a/src/LaraPress/Foundation/Providers/SupportServiceProvider.php +++ b/src/LaraPress/Foundation/Providers/SupportServiceProvider.php @@ -6,8 +6,13 @@ class SupportServiceProvider extends ServiceProvider { + public function boot() + { + $this->loadViewsFrom(dirname(dirname(dirname(__DIR__))) . '/resources/views', 'larapress'); + } + /** - * Boot + * Register * * @return void */ From fb8f83e360b5f66b6664beba009a30b572ed4548 Mon Sep 17 00:00:00 2001 From: Jeff Berry Date: Thu, 13 Oct 2016 16:21:54 -0600 Subject: [PATCH 4/6] Update wp_mail.php --- src/LaraPress/Mail/wp_mail.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/LaraPress/Mail/wp_mail.php b/src/LaraPress/Mail/wp_mail.php index 12ecbab..9015ab4 100644 --- a/src/LaraPress/Mail/wp_mail.php +++ b/src/LaraPress/Mail/wp_mail.php @@ -11,7 +11,7 @@ function wp_mail($to, $subject, $message, $headers = '', $attachments = []) array_values(apply_filters('wp_mail', compact('to', 'subject', 'message', 'headers', 'attachments'))); return $mailer->send( - ['raw' => $message], + view('larapress::email', ['content' => $message]), [], function (\Illuminate\Mail\Message $message) use ($to, $subject, $headers, $attachments) { From 13dbb4176405d2c7efe81330a70742937721e262 Mon Sep 17 00:00:00 2001 From: Brian Detweiler Date: Thu, 13 Oct 2016 16:41:33 -0600 Subject: [PATCH 5/6] Update wp_mail.php --- src/LaraPress/Mail/wp_mail.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LaraPress/Mail/wp_mail.php b/src/LaraPress/Mail/wp_mail.php index 9015ab4..fc6dc93 100644 --- a/src/LaraPress/Mail/wp_mail.php +++ b/src/LaraPress/Mail/wp_mail.php @@ -11,8 +11,8 @@ function wp_mail($to, $subject, $message, $headers = '', $attachments = []) array_values(apply_filters('wp_mail', compact('to', 'subject', 'message', 'headers', 'attachments'))); return $mailer->send( - view('larapress::email', ['content' => $message]), - [], + 'larapress::email', + ['content' => $message], function (\Illuminate\Mail\Message $message) use ($to, $subject, $headers, $attachments) { $message->to($to); From e3e709168f9898497912b62a045734d8c1ee0ea1 Mon Sep 17 00:00:00 2001 From: Brian Detweiler Date: Thu, 8 Dec 2016 16:47:50 -0700 Subject: [PATCH 6/6] Update PostServiceProvider.php --- src/LaraPress/Posts/PostServiceProvider.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/LaraPress/Posts/PostServiceProvider.php b/src/LaraPress/Posts/PostServiceProvider.php index 91437ff..3410aca 100644 --- a/src/LaraPress/Posts/PostServiceProvider.php +++ b/src/LaraPress/Posts/PostServiceProvider.php @@ -32,7 +32,9 @@ protected function registerLoopAndQuery() 'wp', function () { - $this->app->instance('query', $query = Query::newInstanceFromWordPressQuery($GLOBALS['wp_query'])); + $query = $GLOBALS['wp_query']; + $query->set('fields', null); + $this->app->instance('query', $query = Query::newInstanceFromWordPressQuery($query)); $this->app->instance('loop', new Loop($query->get_posts())); } );