summaryrefslogtreecommitdiff
path: root/app/Models/Configuration.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-01-27 21:51:24 +0100
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-01-27 21:51:24 +0100
commit7f51bf0d02b410c482fff60c39c4af532fbc683e (patch)
treefa1a418b0b1be15c8703fc211ac373c873561b5a /app/Models/Configuration.php
parent4e4b0f717fe0a8378e2b751393a8c19d1ada6eb2 (diff)
parent16fffc16dd4cfddc15d3edb224c27147e7661e13 (diff)
Merge branch 'dev' into beta
Diffstat (limited to 'app/Models/Configuration.php')
-rw-r--r--app/Models/Configuration.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Models/Configuration.php b/app/Models/Configuration.php
index f3fb76e72..2a7fe95aa 100644
--- a/app/Models/Configuration.php
+++ b/app/Models/Configuration.php
@@ -48,7 +48,7 @@ class FreshRSS_Configuration {
'bottomline_link' => true,
'sharing' => array(
'shaarli' => '',
- 'poche' => '',
+ 'wallabag' => '',
'diaspora' => '',
'twitter' => true,
'g+' => true,
@@ -185,7 +185,7 @@ class FreshRSS_Configuration {
}
}
public function _sharing ($values) {
- $are_url = array ('shaarli', 'poche', 'diaspora');
+ $are_url = array ('shaarli', 'wallabag', 'diaspora');
foreach ($values as $key => $value) {
if (in_array($key, $are_url)) {
$is_url = (