Преглед изворни кода

Litlle improvements (update system)

- Check UPDATE_FILENAME exists before applying update
- Add empty line at the end of files
Marien Fressinaud пре 11 година
родитељ
комит
3ca8c7ec4c
2 измењених фајлова са 7 додато и 2 уклоњено
  1. 6 1
      app/Controllers/updateController.php
  2. 1 1
      app/views/update/apply.phtml

+ 6 - 1
app/Controllers/updateController.php

@@ -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 {
 			}
 			}
 		}
 		}
 	}
 	}
-}
+}

+ 1 - 1
app/views/update/apply.phtml

@@ -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>