diff options
| author |  Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
| 2015-01-19 13:54:57 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre.alapetite@alexandra.dk>
| 2015-01-19 13:54:57 +0100 |
| commit | d30b3becfa50b96982a3b4880c07cc2b770d7eed (patch) | |
| tree | 145b10fdfa8a5e540132473a29085badcba7c3d2 /app/Controllers/updateController.php | |
| parent | 8b94141fec20f055e17aebe86002cd87d8acf8ad (diff) | |
Addressed warnings when reading from new files
There were warnings when reading extensions (trying to use e.g. README
and .gitignore as directories), and when reading update file.
https://github.com/FreshRSS/FreshRSS/issues/733
Diffstat (limited to 'app/Controllers/updateController.php')
| -rw-r--r-- | app/Controllers/updateController.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php index 61b62773b..4797a3486 100644 --- a/app/Controllers/updateController.php +++ b/app/Controllers/updateController.php @@ -28,7 +28,10 @@ class FreshRSS_update_Controller extends Minz_ActionController { ); } elseif (file_exists(UPDATE_FILENAME)) { // There is an update file to apply! - $version = file_get_contents(join_path(DATA_PATH, 'last_update.txt')); + $version = @file_get_contents(join_path(DATA_PATH, 'last_update.txt')); + if (empty($version)) { + $version = 'unknown'; + } $this->view->update_to_apply = true; $this->view->message = array( 'status' => 'good', |