diff --git a/src/Extension/Extension.php b/src/Extension/Extension.php index 6ae5947f6..3707bfae0 100644 --- a/src/Extension/Extension.php +++ b/src/Extension/Extension.php @@ -267,7 +267,7 @@ class Extension implements Arrayable $extenders = [$extenders]; } - return array_flatten($extenders); + return Arr::flatten($extenders); } /** diff --git a/src/Foundation/Site.php b/src/Foundation/Site.php index 13b715b2c..54dfcb7e1 100644 --- a/src/Foundation/Site.php +++ b/src/Foundation/Site.php @@ -9,6 +9,7 @@ namespace Flarum\Foundation; +use Illuminate\Support\Arr; use RuntimeException; class Site @@ -62,6 +63,6 @@ class Site return []; } - return array_flatten($extenders); + return Arr::flatten($extenders); } } diff --git a/src/Frontend/Content/Assets.php b/src/Frontend/Content/Assets.php index e160adb34..50681f876 100644 --- a/src/Frontend/Content/Assets.php +++ b/src/Frontend/Content/Assets.php @@ -13,6 +13,7 @@ use Flarum\Foundation\Application; use Flarum\Frontend\Compiler\CompilerInterface; use Flarum\Frontend\Document; use Illuminate\Contracts\Container\Container; +use Illuminate\Support\Arr; use Psr\Http\Message\ServerRequestInterface as Request; class Assets @@ -48,7 +49,7 @@ class Assets ]; if ($this->app->inDebugMode()) { - $this->commit(array_flatten($compilers)); + $this->commit(Arr::flatten($compilers)); } $document->js = array_merge($document->js, $this->getUrls($compilers['js'])); diff --git a/views/frontend/admin.blade.php b/views/frontend/admin.blade.php index 2efce2af5..abab7d7fb 100644 --- a/views/frontend/admin.blade.php +++ b/views/frontend/admin.blade.php @@ -8,9 +8,9 @@