fix: Use correct config variables post L10-config update
Specifically the header name had disappeared.
This commit is contained in:
parent
7edac37e16
commit
462c710295
8 changed files with 17 additions and 17 deletions
|
@ -71,7 +71,7 @@ class FeedsController extends Controller
|
||||||
$articles = Article::where('published', '1')->latest('updated_at')->take(20)->get();
|
$articles = Article::where('published', '1')->latest('updated_at')->take(20)->get();
|
||||||
$data = [
|
$data = [
|
||||||
'version' => 'https://jsonfeed.org/version/1',
|
'version' => 'https://jsonfeed.org/version/1',
|
||||||
'title' => 'The JSON Feed for ' . config('app.display_name') . '’s blog',
|
'title' => 'The JSON Feed for ' . config('user.display_name') . '’s blog',
|
||||||
'home_page_url' => config('app.url') . '/blog',
|
'home_page_url' => config('app.url') . '/blog',
|
||||||
'feed_url' => config('app.url') . '/blog/feed.json',
|
'feed_url' => config('app.url') . '/blog/feed.json',
|
||||||
'items' => [],
|
'items' => [],
|
||||||
|
@ -86,7 +86,7 @@ class FeedsController extends Controller
|
||||||
'date_published' => $article->created_at->tz('UTC')->toRfc3339String(),
|
'date_published' => $article->created_at->tz('UTC')->toRfc3339String(),
|
||||||
'date_modified' => $article->updated_at->tz('UTC')->toRfc3339String(),
|
'date_modified' => $article->updated_at->tz('UTC')->toRfc3339String(),
|
||||||
'author' => [
|
'author' => [
|
||||||
'name' => config('app.display_name'),
|
'name' => config('user.display_name'),
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -102,7 +102,7 @@ class FeedsController extends Controller
|
||||||
$notes = Note::latest()->with('media')->take(20)->get();
|
$notes = Note::latest()->with('media')->take(20)->get();
|
||||||
$data = [
|
$data = [
|
||||||
'version' => 'https://jsonfeed.org/version/1',
|
'version' => 'https://jsonfeed.org/version/1',
|
||||||
'title' => 'The JSON Feed for ' . config('app.display_name') . '’s notes',
|
'title' => 'The JSON Feed for ' . config('user.display_name') . '’s notes',
|
||||||
'home_page_url' => config('app.url') . '/notes',
|
'home_page_url' => config('app.url') . '/notes',
|
||||||
'feed_url' => config('app.url') . '/notes/feed.json',
|
'feed_url' => config('app.url') . '/notes/feed.json',
|
||||||
'items' => [],
|
'items' => [],
|
||||||
|
@ -116,7 +116,7 @@ class FeedsController extends Controller
|
||||||
'date_published' => $note->created_at->tz('UTC')->toRfc3339String(),
|
'date_published' => $note->created_at->tz('UTC')->toRfc3339String(),
|
||||||
'date_modified' => $note->updated_at->tz('UTC')->toRfc3339String(),
|
'date_modified' => $note->updated_at->tz('UTC')->toRfc3339String(),
|
||||||
'author' => [
|
'author' => [
|
||||||
'name' => config('app.display_name'),
|
'name' => config('user.display_name'),
|
||||||
],
|
],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -151,7 +151,7 @@ class FeedsController extends Controller
|
||||||
'url' => url('/blog'),
|
'url' => url('/blog'),
|
||||||
'author' => [
|
'author' => [
|
||||||
'type' => 'card',
|
'type' => 'card',
|
||||||
'name' => config('user.displayname'),
|
'name' => config('user.display_name'),
|
||||||
'url' => config('url.longurl'),
|
'url' => config('url.longurl'),
|
||||||
],
|
],
|
||||||
'children' => $items,
|
'children' => $items,
|
||||||
|
@ -187,7 +187,7 @@ class FeedsController extends Controller
|
||||||
'url' => url('/notes'),
|
'url' => url('/notes'),
|
||||||
'author' => [
|
'author' => [
|
||||||
'type' => 'card',
|
'type' => 'card',
|
||||||
'name' => config('user.displayname'),
|
'name' => config('user.display_name'),
|
||||||
'url' => config('url.longurl'),
|
'url' => config('url.longurl'),
|
||||||
],
|
],
|
||||||
'children' => $items,
|
'children' => $items,
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'displayname' => env('DISPLAY_NAME'),
|
'display_name' => env('DISPLAY_NAME'),
|
||||||
|
|
||||||
'username' => env('USER_NAME'),
|
'username' => env('USER_NAME'),
|
||||||
];
|
];
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<feed xmlns="http://www.w3.org/2005/Atom">
|
<feed xmlns="http://www.w3.org/2005/Atom">
|
||||||
<title>Atom feed for {{ config('app.display_name') }}’s blog</title>
|
<title>Atom feed for {{ config('user.display_name') }}’s blog</title>
|
||||||
<link rel="self" href="{{ config('app.url') }}/blog/feed.atom" />
|
<link rel="self" href="{{ config('app.url') }}/blog/feed.atom" />
|
||||||
<id>{{ config('app.url')}}/blog</id>
|
<id>{{ config('app.url')}}/blog</id>
|
||||||
<updated>{{ $articles[0]->updated_at->toAtomString() }}</updated>
|
<updated>{{ $articles[0]->updated_at->toAtomString() }}</updated>
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
<updated>{{ $article->updated_at->toAtomString() }}</updated>
|
<updated>{{ $article->updated_at->toAtomString() }}</updated>
|
||||||
<content>{{ $article->main }}</content>
|
<content>{{ $article->main }}</content>
|
||||||
<author>
|
<author>
|
||||||
<name>{{ config('app.display_name') }}</name>
|
<name>{{ config('user.display_name') }}</name>
|
||||||
</author>
|
</author>
|
||||||
</entry>
|
</entry>
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
|
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
|
||||||
<channel>
|
<channel>
|
||||||
<title>{{ config('app.display_name') }}</title>
|
<title>{{ config('user.display_name') }}</title>
|
||||||
<atom:link href="{{ config('app.url') }}/blog/feed.rss" rel="self" type="application/rss+xml" />
|
<atom:link href="{{ config('app.url') }}/blog/feed.rss" rel="self" type="application/rss+xml" />
|
||||||
<description>An RSS feed of the blog posts found on {{ config('url.longurl') }}</description>
|
<description>An RSS feed of the blog posts found on {{ config('url.longurl') }}</description>
|
||||||
<link>{{ config('app.url') }}/blog</link>
|
<link>{{ config('app.url') }}/blog</link>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<html lang="en-GB">
|
<html lang="en-GB">
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<title>@yield('title'){{ config('app.display_name') }}</title>
|
<title>@yield('title'){{ config('app.name') }}</title>
|
||||||
<meta name="viewport" content="width=device-width">
|
<meta name="viewport" content="width=device-width">
|
||||||
@if (!empty(config('app.font_link')))
|
@if (!empty(config('app.font_link')))
|
||||||
<link rel="stylesheet" href="{{ config('app.font_link') }}">
|
<link rel="stylesheet" href="{{ config('app.font_link') }}">
|
||||||
|
@ -31,7 +31,7 @@
|
||||||
<body class="grid">
|
<body class="grid">
|
||||||
<header id="site-header">
|
<header id="site-header">
|
||||||
<h1>
|
<h1>
|
||||||
<a rel="author" href="/">{{ config('app.display_name') }}</a>
|
<a rel="author" href="/">{{ config('user.display_name') }}</a>
|
||||||
</h1>
|
</h1>
|
||||||
<nav>
|
<nav>
|
||||||
<a href="/">All</a>
|
<a href="/">All</a>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<feed xmlns="http://www.w3.org/2005/Atom">
|
<feed xmlns="http://www.w3.org/2005/Atom">
|
||||||
<title>Atom feed for {{ config('app.display_name') }}’s notes</title>
|
<title>Atom feed for {{ config('user.display_name') }}’s notes</title>
|
||||||
<link rel="self" href="{{ config('app.url') }}/notes/feed.atom" />
|
<link rel="self" href="{{ config('app.url') }}/notes/feed.atom" />
|
||||||
<id>{{ config('app.url')}}/notes</id>
|
<id>{{ config('app.url')}}/notes</id>
|
||||||
<updated>{{ $notes[0]->updated_at->toAtomString() }}</updated>
|
<updated>{{ $notes[0]->updated_at->toAtomString() }}</updated>
|
||||||
|
@ -13,7 +13,7 @@
|
||||||
<updated>{{ $note->updated_at->toAtomString() }}</updated>
|
<updated>{{ $note->updated_at->toAtomString() }}</updated>
|
||||||
<content type="html">{{ $note->note }}</content>
|
<content type="html">{{ $note->note }}</content>
|
||||||
<author>
|
<author>
|
||||||
<name>{{ config('app.display_name') }}</name>
|
<name>{{ config('user.display_name') }}</name>
|
||||||
</author>
|
</author>
|
||||||
</entry>
|
</entry>
|
||||||
@endforeach
|
@endforeach
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8" ?>
|
<?xml version="1.0" encoding="UTF-8" ?>
|
||||||
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
|
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
|
||||||
<channel>
|
<channel>
|
||||||
<title>{{ config('app.display_name') }}</title>
|
<title>{{ config('user.display_name') }}</title>
|
||||||
<atom:link href="{{ config('app.url') }}/notes/feed.rss" rel="self" type="application/rss+xml" />
|
<atom:link href="{{ config('app.url') }}/notes/feed.rss" rel="self" type="application/rss+xml" />
|
||||||
<description>An RSS feed of the notes found on {{ config('url.longurl') }}</description>
|
<description>An RSS feed of the notes found on {{ config('url.longurl') }}</description>
|
||||||
<link>{{ config('app.url') }}/notes</link>
|
<link>{{ config('app.url') }}/notes</link>
|
||||||
|
|
|
@ -64,7 +64,7 @@ class FeedsTest extends TestCase
|
||||||
'url' => url('/blog'),
|
'url' => url('/blog'),
|
||||||
'author' => [
|
'author' => [
|
||||||
'type' => 'card',
|
'type' => 'card',
|
||||||
'name' => config('user.displayname'),
|
'name' => config('user.display_name'),
|
||||||
'url' => config('url.longurl'),
|
'url' => config('url.longurl'),
|
||||||
],
|
],
|
||||||
'children' => [[
|
'children' => [[
|
||||||
|
@ -125,7 +125,7 @@ class FeedsTest extends TestCase
|
||||||
'url' => url('/notes'),
|
'url' => url('/notes'),
|
||||||
'author' => [
|
'author' => [
|
||||||
'type' => 'card',
|
'type' => 'card',
|
||||||
'name' => config('user.displayname'),
|
'name' => config('user.display_name'),
|
||||||
'url' => config('url.longurl'),
|
'url' => config('url.longurl'),
|
||||||
],
|
],
|
||||||
'children' => [[
|
'children' => [[
|
||||||
|
|
Loading…
Add table
Reference in a new issue