summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-10-08 22:23:36 +0200
committerGravatar GitHub <noreply@github.com> 2016-10-08 22:23:36 +0200
commitbaa091fa0a8635b2fe2393f31bc61e12f0ed9a68 (patch)
tree1e17e114e692e43da0085750d5fa86d1bd23ef68
parentd6ca6e085e5062cdb544e22805334a90827638b0 (diff)
parent79696f31adde2a3e0a224294104b19ccc77565cc (diff)
Merge pull request #1294 from Alkarex/meta-description
Meta description option
-rw-r--r--app/Models/Context.php2
-rw-r--r--data/config.default.php3
2 files changed, 5 insertions, 0 deletions
diff --git a/app/Models/Context.php b/app/Models/Context.php
index 33e65a619..a38b1e0f1 100644
--- a/app/Models/Context.php
+++ b/app/Models/Context.php
@@ -144,11 +144,13 @@ class FreshRSS_Context {
case 'a':
self::$current_get['all'] = true;
self::$name = _t('index.feed.title');
+ self::$description = self::$system_conf->meta_description;
self::$get_unread = self::$total_unread;
break;
case 's':
self::$current_get['starred'] = true;
self::$name = _t('index.feed.title_fav');
+ self::$description = self::$system_conf->meta_description;
self::$get_unread = self::$total_starred['unread'];
// Update state if favorite is not yet enabled.
diff --git a/data/config.default.php b/data/config.default.php
index af1482d03..d3cd3bf22 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -27,6 +27,9 @@ return array(
# Title of this FreshRSS instance in the Web user interface.
'title' => 'FreshRSS',
+ # Meta description used when `allow_robots` is true.
+ 'meta_description' => '',
+
# Name of the user that has administration rights.
'default_user' => '_',