summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/configuration/application.ini6
-rwxr-xr-xapp/models/RSSConfiguration.php2
2 files changed, 3 insertions, 5 deletions
diff --git a/app/configuration/application.ini b/app/configuration/application.ini
index c98622c5d..149bc6c5b 100644
--- a/app/configuration/application.ini
+++ b/app/configuration/application.ini
@@ -3,10 +3,8 @@ environment = "development"
use_url_rewriting = true
sel_application = "flux rss lalala ~~~"
-base_url = "/~marien/rss/public"
-title = "Flux RSS"
-language = "fr"
-cache_enabled = false ; n'influe pas sur le cache de SimplePie
+base_url = "/~marien/rss/public" ; pas de slash à la fin /!\
+title = "FreshRSS"
[db]
host = "localhost"
diff --git a/app/models/RSSConfiguration.php b/app/models/RSSConfiguration.php
index 0d95bec1d..d0fb8a683 100755
--- a/app/models/RSSConfiguration.php
+++ b/app/models/RSSConfiguration.php
@@ -109,7 +109,7 @@ class RSSConfigurationDAO extends Model_array {
public $mail_login = '';
public function __construct () {
- parent::__construct (PUBLIC_PATH . '/data/db/Configuration.array.php');
+ parent::__construct (PUBLIC_PATH . '/data/Configuration.array.php');
if (isset ($this->array['posts_per_page'])) {
$this->posts_per_page = $this->array['posts_per_page'];