🏡 index : ~doyle/koselig.git

author Jordan Doyle <jordan@doyle.wf> 2016-10-22 19:04:17.0 +00:00:00
committer Jordan Doyle <jordan@doyle.wf> 2016-10-22 19:04:17.0 +00:00:00
commit
6bb8f14d1823cf13d0f7f640f2e24c8c0d88c38e [patch]
tree
8b59ef056d527b3fa2302254952b050867adf225
parent
1842c21116632ccb5148938fce80dcfc7793b224
download
6bb8f14d1823cf13d0f7f640f2e24c8c0d88c38e.tar.gz

Add gravityform directive & fix 404 on get routes that dont exist inside wordpress



Diff

 src/Mail/WordpressMailServiceProvider.php            | 2 +-
 src/Providers/WordpressTemplatingServiceProvider.php | 6 ++++++
 src/Support/Wordpress.php                            | 6 +++---
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/Mail/WordpressMailServiceProvider.php b/src/Mail/WordpressMailServiceProvider.php
index 89acc32..bdba577 100644
--- a/src/Mail/WordpressMailServiceProvider.php
+++ b/src/Mail/WordpressMailServiceProvider.php
@@ -4,7 +4,7 @@ namespace Koselig\Mail;
use Illuminate\Support\ServiceProvider;

/**
 *
 * Override Wordpress' wp_mail function to use the Laravel mailer.
 *
 * @author Jordan Doyle <jordan@doyle.wf>
 */
diff --git a/src/Providers/WordpressTemplatingServiceProvider.php b/src/Providers/WordpressTemplatingServiceProvider.php
index d9731af..fb7a573 100644
--- a/src/Providers/WordpressTemplatingServiceProvider.php
+++ b/src/Providers/WordpressTemplatingServiceProvider.php
@@ -34,5 +34,11 @@ class WordpressTemplatingServiceProvider extends ServiceProvider
        Blade::directive('wpfooter', function ($expression) {
            return '<?php wp_footer(); ?>';
        });

        if (function_exists('gravity_form')) {
            Blade::directive('gravityform', function ($expression) {
                return "<?php gravity_form({$expression}); ?>";
            });
        }
    }
}
diff --git a/src/Support/Wordpress.php b/src/Support/Wordpress.php
index ba36cee..24d24b2 100644
--- a/src/Support/Wordpress.php
+++ b/src/Support/Wordpress.php
@@ -20,7 +20,7 @@ class Wordpress
    public static function id()
    {
        // can't use facades to access properties unfortunately!
        return app('query')->post->ID;
        return app('query')->post->ID ?? null;
    }

    /**
@@ -108,12 +108,12 @@ class Wordpress

    /**
     * Get the current logged in user. Generally, you shouldn't be using this
     * function and should instead be using Auth::user() from Laravel to get
     * function and should instead be using <code>auth()->user()</code> from Laravel to get
     * the current logged in Wordpress user.
     *
     * Use of WP_User is deprecated, however this method will not be removed.
     *
     * @deprecated use <code>Auth::user()</code> instead.
     * @deprecated use <code>auth()->user()</code> instead.
     * @return \WP_User
     */
    public static function currentUser()