🏡 index : ~doyle/koselig.git

author Jordan Doyle <jordan@doyle.la> 2018-04-29 11:49:24.0 +00:00:00
committer Jordan Doyle <jordan@doyle.la> 2018-04-29 11:49:24.0 +00:00:00
commit
a711b9e35090c77daba2c59e00a18ccacbc37af5 [patch]
tree
12607a6584e114b1a588807690e630f224564eba
parent
25953e509228ea716261e737493e1fcd71e193be
parent
ebd4e40330b7488d8269ad0199da0a709f09745f
download
a711b9e35090c77daba2c59e00a18ccacbc37af5.tar.gz

Merge branch 'master' of github.com:koselig/library



Diff

 src/Providers/WordpressServiceProvider.php | 3 ++-
 src/Proxy/WordpressDatabase.php            | 5 ++++-
 src/Support/RecursiveMenuIterator.php      | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Providers/WordpressServiceProvider.php b/src/Providers/WordpressServiceProvider.php
index 73f292e..cb52df3 100644
--- a/src/Providers/WordpressServiceProvider.php
+++ b/src/Providers/WordpressServiceProvider.php
@@ -139,7 +139,8 @@ class WordpressServiceProvider extends ServiceProvider
     * `__`. As Laravel's `__` is quite a bit more useful than
     * Wordpress'.
     */
    protected function patchWordpressL10n() {
    protected function patchWordpressL10n()
    {
        Cache::rememberForever('patch_wp_l10n', function () {
            $path = ABSPATH . 'wp-includes' . DIRECTORY_SEPARATOR . 'l10n.php';

diff --git a/src/Proxy/WordpressDatabase.php b/src/Proxy/WordpressDatabase.php
index a008bdc..fad47db 100644
--- a/src/Proxy/WordpressDatabase.php
+++ b/src/Proxy/WordpressDatabase.php
@@ -72,12 +72,15 @@ class WordpressDatabase extends wpdb
     * Determine if a database supports a particular feature.
     *
     * @see wpdb::has_cap()
     *
     * @param string $capability The feature to check for. Accepts 'collation',
     *                           'group_concat', 'subqueries', 'set_charset',
     *                           'utf8mb4', or 'utf8mb4_520'.
     *
     * @return int|false Whether the database feature is supported, false otherwise.
     */
    public function has_cap($capability) {
    public function has_cap($capability)
    {
        $capability = strtolower($capability);

        switch ($capability) {
diff --git a/src/Support/RecursiveMenuIterator.php b/src/Support/RecursiveMenuIterator.php
index 2f79c63..7e1e225 100644
--- a/src/Support/RecursiveMenuIterator.php
+++ b/src/Support/RecursiveMenuIterator.php
@@ -33,7 +33,7 @@ class RecursiveMenuIterator implements RecursiveIterator

            // only have nodes without a parent at the top level of the tree
            $this->items = collect($itemsArray)->filter(function ($item) {
                return $item->menu_item_parent == 0;
                return $item->menu_item_parent === 0 || $item->menu_item_parent === '0';
            })->reverse()->values();
        } else {
            $this->items = $menu;