aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/importExportController.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-10-20 18:45:22 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2014-10-20 18:45:22 +0200
commit1a22a87fb1b1fcb61d201de399c33c2185dc1f6e (patch)
treeb0a9a2fb19b6cf01be8496131b4e7d552137835c /app/Controllers/importExportController.php
parentad92dd7dae35e7205da3172d4ba35ea01da2bc8b (diff)
Use FreshRSS_Context::$conf only
- Replace $this->view->conf in controllers - Replace $this->conf in views
Diffstat (limited to 'app/Controllers/importExportController.php')
-rw-r--r--app/Controllers/importExportController.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php
index aaac1b68b..ab277e688 100644
--- a/app/Controllers/importExportController.php
+++ b/app/Controllers/importExportController.php
@@ -289,7 +289,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
return true;
}
- $is_read = $this->view->conf->mark_when['reception'] ? 1 : 0;
+ $is_read = FreshRSS_Context::$conf->mark_when['reception'] ? 1 : 0;
$google_compliant = strpos($article_object['id'], 'com.google') !== false;
@@ -484,7 +484,7 @@ class FreshRSS_importExport_Controller extends Minz_ActionController {
$this->view->type = 'feed/' . $feed->id();
$this->view->entries = $this->entryDAO->listWhere(
'f', $feed->id(), FreshRSS_Entry::STATE_ALL, 'ASC',
- $this->view->conf->posts_per_page
+ FreshRSS_Context::$conf->posts_per_page
);
$this->view->feed = $feed;
}