mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-13 21:06:24 +02:00
Code Issues Releases Wiki Activity

Replace a few forgotten obsolete helpers

Browse Source 
- Apparently, I forgot that `array_flatten` comes from Laravel. :)
- When I did this previously, I did not search the views directory.
This commit is contained in:
Franz Liedke
2020-07-24 17:27:59 +02:00
parent 3b39c212e0
commit e4077ab4ad
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Extension/Extension.php
View File

@ -267,7 +267,7 @@ class Extension implements Arrayable
$extenders = [$extenders]; $extenders = [$extenders];
} }
return array_flatten($extenders); return Arr::flatten($extenders);
} }
/** /**

3
src/Foundation/Site.php
View File

@ -9,6 +9,7 @@
namespace Flarum\Foundation; namespace Flarum\Foundation;
use Illuminate\Support\Arr;
use RuntimeException; use RuntimeException;
class Site class Site
@ -62,6 +63,6 @@ class Site
return []; return [];
} }
return array_flatten($extenders); return Arr::flatten($extenders);
} }
} }

3
src/Frontend/Content/Assets.php
View File

@ -13,6 +13,7 @@ use Flarum\Foundation\Application;
use Flarum\Frontend\Compiler\CompilerInterface; use Flarum\Frontend\Compiler\CompilerInterface;
use Flarum\Frontend\Document; use Flarum\Frontend\Document;
use Illuminate\Contracts\Container\Container; use Illuminate\Contracts\Container\Container;
use Illuminate\Support\Arr;
use Psr\Http\Message\ServerRequestInterface as Request; use Psr\Http\Message\ServerRequestInterface as Request;
class Assets class Assets
@ -48,7 +49,7 @@ class Assets
]; ];
if ($this->app->inDebugMode()) { if ($this->app->inDebugMode()) {
$this->commit(array_flatten($compilers)); $this->commit(Arr::flatten($compilers));
} }
$document->js = array_merge($document->js, $this->getUrls($compilers['js'])); $document->js = array_merge($document->js, $this->getUrls($compilers['js']));

6
views/frontend/admin.blade.php
View File

@ -8,9 +8,9 @@
<div id="header-navigation" class="Header-navigation"></div> <div id="header-navigation" class="Header-navigation"></div>
<div class="container"> <div class="container">
<h1 class="Header-title"> <h1 class="Header-title">
<a href="{{ array_get($forum, 'baseUrl') }}"> <a href="{{ \Illuminate\Support\Arr::get($forum, 'baseUrl') }}">
<?php $title = array_get($forum, 'title'); ?> <?php $title = \Illuminate\Support\Arr::get($forum, 'title'); ?>
@if ($logo = array_get($forum, 'logoUrl')) @if ($logo = \Illuminate\Support\Arr::get($forum, 'logoUrl'))
<img src="{{ $logo }}" alt="{{ $title }}" class="Header-logo"> <img src="{{ $logo }}" alt="{{ $title }}" class="Header-logo">
@else @else
{{ $title }} {{ $title }}

12
views/frontend/forum.blade.php
View File

@ -1,4 +1,4 @@
{!! array_get($forum, 'headerHtml') !!} {!! \Illuminate\Support\Arr::get($forum, 'headerHtml') !!}
<div id="app" class="App"> <div id="app" class="App">
@ -10,11 +10,11 @@
<div id="header-navigation" class="Header-navigation"></div> <div id="header-navigation" class="Header-navigation"></div>
<div class="container"> <div class="container">
<h1 class="Header-title"> <h1 class="Header-title">
<a href="{{ array_get($forum, 'baseUrl') }}" id="home-link"> <a href="{{ \Illuminate\Support\Arr::get($forum, 'baseUrl') }}" id="home-link">
@if ($logo = array_get($forum, 'logoUrl')) @if ($logo = \Illuminate\Support\Arr::get($forum, 'logoUrl'))
<img src="{{ $logo }}" alt="{{ array_get($forum, 'title') }}" class="Header-logo"> <img src="{{ $logo }}" alt="{{ \Illuminate\Support\Arr::get($forum, 'title') }}" class="Header-logo">
@else @else
{{ array_get($forum, 'title') }} {{ \Illuminate\Support\Arr::get($forum, 'title') }}
@endif @endif
</a> </a>
</h1> </h1>
@ -39,4 +39,4 @@
</div> </div>
{!! array_get($forum, 'footerHtml') !!} {!! \Illuminate\Support\Arr::get($forum, 'footerHtml') !!}