diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-06 18:53:36 +0100 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2015-01-06 18:53:36 +0100 |
| commit | d3a93ea2905ae50a2365d293f9f3ef3e51bf5f30 (patch) | |
| tree | fbf240e82b244fc19907529750dd8be912d97b4b /app/layout | |
| parent | d27efeec04c7c41cf0f52bc7f89879e66f2e44a9 (diff) | |
BREAKING FEATURE: Remove general in config
General attribute has been removed from system config.
Now subattributes (e.g. environment, salt, title, etc.) are directly accessible.
YOU HAVE TO FIX YOUR ./data/config.php file!
- Remove the general array
- Values inside this array must be kept
- To see what it must look like, please have a look to ./data/config.default.php
(but keep your values!!).
See https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'app/layout')
| -rw-r--r-- | app/layout/header.phtml | 6 | ||||
| -rw-r--r-- | app/layout/layout.phtml | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/layout/header.phtml b/app/layout/header.phtml index 2f16b5f63..97e24a1d9 100644 --- a/app/layout/header.phtml +++ b/app/layout/header.phtml @@ -1,7 +1,5 @@ <?php -$conf = Minz_Configuration::get('system'); - if (FreshRSS_Auth::accessNeedLogin()) { ?><ul class="nav nav-head nav-login"><?php if (FreshRSS_Auth::hasAccess()) { @@ -18,13 +16,13 @@ if (FreshRSS_Auth::accessNeedLogin()) { <h1> <a href="<?php echo _url('index', 'index'); ?>"> <img class="logo" src="<?php echo _i('icon', true); ?>" alt="⊚" /> - <?php echo $conf->general['title']; ?> + <?php echo FreshRSS_Context::$system_conf->title; ?> </a> </h1> </div> <div class="item search"> - <?php if (FreshRSS_Auth::hasAccess() || $conf->general['allow_anonymous']) { ?> + <?php if (FreshRSS_Auth::hasAccess() || FreshRSS_Context::$system_conf->allow_anonymous) { ?> <form action="<?php echo _url('index', 'index'); ?>" method="get"> <div class="stick"> <?php $search = Minz_Request::param('search', ''); ?> diff --git a/app/layout/layout.phtml b/app/layout/layout.phtml index b3734aa56..ed8029fe0 100644 --- a/app/layout/layout.phtml +++ b/app/layout/layout.phtml @@ -35,7 +35,7 @@ <link rel="apple-touch-icon" href="<?php echo Minz_Url::display('/themes/icons/apple-touch-icon.png'); ?>"> <meta name="apple-mobile-web-app-capable" content="yes" /> <meta name="apple-mobile-web-app-status-bar-style" content="black" /> - <meta name="apple-mobile-web-app-title" content="<?php echo $conf->general['title'] ?>"> + <meta name="apple-mobile-web-app-title" content="<?php echo FreshRSS_Context::$system_conf->title; ?>"> <meta name="msapplication-TileColor" content="#FFF" /> <meta name="robots" content="noindex,nofollow" /> </head> |