summaryrefslogtreecommitdiff
path: root/app/controllers/feedController.php
diff options
context:
space:
mode:
authorGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-04-13 15:27:36 +0200
committerGravatar Marien Fressinaud <dev@marienfressinaud.fr> 2013-04-13 15:27:36 +0200
commit9b9543109e36a5409fe71eb084cfac680dfc7cbd (patch)
tree0876746883cd90d5f1e9a63e208342699e427690 /app/controllers/feedController.php
parenta4beb7b772fdc3c8c894b93611bfb030c9456f07 (diff)
Fix issue #39 : actualisation de tous les flux grâce à Ajax
Diffstat (limited to 'app/controllers/feedController.php')
-rwxr-xr-xapp/controllers/feedController.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/app/controllers/feedController.php b/app/controllers/feedController.php
index d2a2184eb..83fc19e20 100755
--- a/app/controllers/feedController.php
+++ b/app/controllers/feedController.php
@@ -156,9 +156,13 @@ class feedController extends ActionController {
'content' => 'Aucun flux n\'a pu être mis à jour'
);
}
- Session::_param ('notification', $notif);
- Request::forward (array (), true);
+ if (Request::param ('ajax', 0) == 0) {
+ Session::_param ('notification', $notif);
+ Request::forward (array (), true);
+ } else {
+ $this->view->_useLayout (false);
+ }
}
public function massiveImportAction () {