mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-24 18:21:33 +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 9de0901293
commit 1b78f0ca60
5 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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