mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-01 14:10:37 +02:00
Code Issues Releases Wiki Activity

Combine URL generator classes into one

Browse Source
This commit is contained in:
Franz Liedke
2017-06-25 23:33:02 +02:00
parent cc118d4c29
commit dbd034eaf4
19 changed files with 104 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
framework/core/views/index.blade.php
View File

@@ -1,5 +1,5 @@
<?php
$url = app('Flarum\Forum\UrlGenerator');
$url = app('Flarum\Http\UrlGenerator');
?>
<div class="container">
<h2>{{ $translator->trans('core.views.index.all_discussions_heading') }}</h2>
@@ -7,7 +7,7 @@ $url = app('Flarum\Forum\UrlGenerator');
<ul>
@foreach ($document->data as $discussion)
<li>
<a href="{{ $url->toRoute('discussion', [
<a href="{{ $url->to('forum')->route('discussion', [
'id' => $discussion->id . '-' . $discussion->attributes->slug
]) }}">
{{ $discussion->attributes->title }}
@@ -16,5 +16,5 @@ $url = app('Flarum\Forum\UrlGenerator');
@endforeach
</ul>
<a href="{{ $url->toRoute('index') }}?page={{ $page + 1 }}">{{ $translator->trans('core.views.index.next_page_button') }} &raquo;</a>
<a href="{{ $url->to('forum')->route('index') }}?page={{ $page + 1 }}">{{ $translator->trans('core.views.index.next_page_button') }} &raquo;</a>
</div>

2
framework/core/views/reset.blade.php
View File

@@ -15,7 +15,7 @@
<p style="color:red">{{ $error }}</p>
@endif
<form class="form-horizontal" role="form" method="POST" action="{{ app('Flarum\Forum\UrlGenerator')->toRoute('savePassword') }}">
<form class="form-horizontal" role="form" method="POST" action="{{ app('Flarum\Http\UrlGenerator')->to('forum')->route('savePassword') }}">
<input type="hidden" name="csrfToken" value="{{ $csrfToken }}">
<input type="hidden" name="passwordToken" value="{{ $passwordToken }}">