diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-11-02 21:34:14 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-11-02 21:34:14 +0100 |
| commit | 455e488e791cb0dd64b3b660ed8afa418d6c9641 (patch) | |
| tree | 84ba0bf1bbaaae9f822efe801e4606191864ec74 /app/Controllers/updateController.php | |
| parent | a74eac88d8ccd38ff700e12cc42410e4780349a0 (diff) | |
| parent | 697817eebf754c2a05c7b4c88df1f13dbd0179da (diff) | |
Merge pull request #1024 from marienfressinaud/feature/make-url-auto-update-in-config
Move auto-update server URL alterable (config)
Diffstat (limited to 'app/Controllers/updateController.php')
| -rw-r--r-- | app/Controllers/updateController.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/Controllers/updateController.php b/app/Controllers/updateController.php index 84a33fe85..64c984b04 100644 --- a/app/Controllers/updateController.php +++ b/app/Controllers/updateController.php @@ -53,7 +53,8 @@ class FreshRSS_update_Controller extends Minz_ActionController { return; } - $c = curl_init(FRESHRSS_UPDATE_WEBSITE); + $auto_update_url = FreshRSS_Context::$system_conf->auto_update_url . '?v=' . FRESHRSS_VERSION; + $c = curl_init($auto_update_url); curl_setopt($c, CURLOPT_RETURNTRANSFER, true); curl_setopt($c, CURLOPT_SSL_VERIFYPEER, true); curl_setopt($c, CURLOPT_SSL_VERIFYHOST, 2); @@ -70,7 +71,7 @@ class FreshRSS_update_Controller extends Minz_ActionController { $this->view->message = array( 'status' => 'bad', 'title' => _t('gen.short.damn'), - 'body' => _t('feedback.update.server_not_found', FRESHRSS_UPDATE_WEBSITE) + 'body' => _t('feedback.update.server_not_found', $auto_update_url) ); return; } |