aboutsummaryrefslogtreecommitdiff
path: root/app/Controllers/javascriptController.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2016-07-23 17:11:38 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2016-07-23 17:11:38 +0200
commit3f705cf03ccd919e0930bc3e95b98daff9f0560a (patch)
treee12c530198e3d5ee7032d5aaa381e7ecc8781cdf /app/Controllers/javascriptController.php
parentca6ca218dca17c3806191f72fa2b3fe02acc1692 (diff)
parent43f3be7098a908321c29a14a1fbe542389479155 (diff)
Merge branch 'dev'
Diffstat (limited to 'app/Controllers/javascriptController.php')
-rwxr-xr-xapp/Controllers/javascriptController.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/Controllers/javascriptController.php b/app/Controllers/javascriptController.php
index e3ae3669e..00a7b5c38 100755
--- a/app/Controllers/javascriptController.php
+++ b/app/Controllers/javascriptController.php
@@ -6,7 +6,7 @@ class FreshRSS_javascript_Controller extends Minz_ActionController {
}
public function actualizeAction() {
- header('Content-Type: text/javascript; charset=UTF-8');
+ header('Content-Type: application/json; charset=UTF-8');
$feedDAO = FreshRSS_Factory::createFeedDao();
$this->view->feeds = $feedDAO->listFeedsOrderUpdate(FreshRSS_Context::$user_conf->ttl_default);
}