Litlle improvements (update system)

- Check UPDATE_FILENAME exists before applying update
- Add empty line at the end of files
pull/585/merge
Marien Fressinaud 10 years ago
parent 9a5d6245fb
commit 3ca8c7ec4c
  1. 7
      app/Controllers/updateController.php
  2. 2
      app/views/update/apply.phtml

@ -79,10 +79,15 @@ class FreshRSS_update_Controller extends Minz_ActionController {
'body' => _t('update_server_not_found', FRESHRSS_UPDATE_WEBSITE) 'body' => _t('update_server_not_found', FRESHRSS_UPDATE_WEBSITE)
); );
} }
curl_close($c); curl_close($c);
} }
public function applyAction() { public function applyAction() {
if (!file_exists(UPDATE_FILENAME)) {
Minz_Request::forward(array('c' => 'update'), true);
}
require(UPDATE_FILENAME); require(UPDATE_FILENAME);
if (Minz_Request::isPost()) { if (Minz_Request::isPost()) {
@ -113,4 +118,4 @@ class FreshRSS_update_Controller extends Minz_ActionController {
} }
} }
} }
} }

@ -6,4 +6,4 @@
<h1><?php echo _t('update_system'); ?></h1> <h1><?php echo _t('update_system'); ?></h1>
<?php ask_info_update(); ?> <?php ask_info_update(); ?>
</div> </div>

Loading…
Cancel
Save