diff options
| author |  Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-10-26 16:49:44 +0200 |
|---|---|---|
| committer | Marien Fressinaud <dev@marienfressinaud.fr>
| 2013-10-26 16:49:44 +0200 |
| commit | dd5273871a74d01d87fa1eaad7aa53bc1c148f85 (patch) | |
| tree | d59245952cc982ef8b09119e71739d3c0adc2c99 /app/controllers/indexController.php | |
| parent | 298b5ecf206ff0020d8fed29e9aba4d7b148b080 (diff) | |
| parent | 410f7631988e277d615c5acab44d3380f5f34b9b (diff) | |
Merge branch 'AvoidNonCacheableJavaScript' of https://github.com/Alkarex/FreshRSS into Alkarex-AvoidNonCacheableJavaScript
Conflicts:
app/views/javascript/main.phtml
Diffstat (limited to 'app/controllers/indexController.php')
| -rwxr-xr-x | app/controllers/indexController.php | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/controllers/indexController.php b/app/controllers/indexController.php index d1c615d6d..9f71c0e57 100755 --- a/app/controllers/indexController.php +++ b/app/controllers/indexController.php @@ -11,15 +11,13 @@ class indexController extends ActionController { if ($output == 'rss') { $this->view->_useLayout (false); } else { - View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'actualize'))); - if(!$output) { $output = $this->view->conf->viewMode(); Request::_param ('output', $output); } View::appendScript (Url::display ('/scripts/shortcut.js')); - View::appendScript (Url::display (array ('c' => 'javascript', 'a' => 'main'))); + View::appendScript (Url::display ('/scripts/main.js')); View::appendScript (Url::display ('/scripts/endless_mode.js')); if ($output == 'global') { |