From 3ca8c7ec4c55b4fa751fbcdc8e28f28351c4a967 Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 10 Aug 2014 11:52:18 +0200
Subject: [PATCH] Litlle improvements (update system)

- Check UPDATE_FILENAME exists before applying update
- Add empty line at the end of files
---
 app/Controllers/updateController.php | 7 ++++++-
 app/views/update/apply.phtml         | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php
index 1095f9da7..fa62f4a70 100644
--- a/app/Controllers/updateController.php
+++ b/app/Controllers/updateController.php
@@ -79,10 +79,15 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 				'body' => _t('update_server_not_found', FRESHRSS_UPDATE_WEBSITE)
 			);
 		}
+
 		curl_close($c);
 	}
 
 	public function applyAction() {
+		if (!file_exists(UPDATE_FILENAME)) {
+			Minz_Request::forward(array('c' => 'update'), true);
+		}
+
 		require(UPDATE_FILENAME);
 
 		if (Minz_Request::isPost()) {
@@ -113,4 +118,4 @@ class FreshRSS_update_Controller extends Minz_ActionController {
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/app/views/update/apply.phtml b/app/views/update/apply.phtml
index d7ea466c5..30566c7ab 100644
--- a/app/views/update/apply.phtml
+++ b/app/views/update/apply.phtml
@@ -6,4 +6,4 @@
 	<h1><?php echo _t('update_system'); ?></h1>
 
 	<?php ask_info_update(); ?>
-</div>
\ No newline at end of file
+</div>