summaryrefslogtreecommitdiff
path: root/lib/Minz/View.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-08 10:27:01 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2015-01-08 10:27:01 +0100
commit46e98bad9119c3ee7088b65ebb6b4d1331419602 (patch)
tree6f0e081597ba9ced0c0faca9b5e4c04394605aaf /lib/Minz/View.php
parent7584364a4c2b407e97909e94ba274da62620abea (diff)
parent9265cd57333b2a91effc6ea284b504fbc977b9ed (diff)
Merge branch '730-improve_configuration' into dev
BREAKING FEATURE: please follow instructions from https://github.com/FreshRSS/FreshRSS/issues/730 to update your configuration file. Fix https://github.com/FreshRSS/FreshRSS/issues/730
Diffstat (limited to 'lib/Minz/View.php')
-rw-r--r--lib/Minz/View.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/Minz/View.php b/lib/Minz/View.php
index b40448491..481b0376d 100644
--- a/lib/Minz/View.php
+++ b/lib/Minz/View.php
@@ -28,7 +28,9 @@ class Minz_View {
public function __construct () {
$this->change_view(Minz_Request::controllerName(),
Minz_Request::actionName());
- self::$title = Minz_Configuration::title ();
+
+ $conf = Minz_Configuration::get('system');
+ self::$title = $conf->title;
}
/**