diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-11-02 21:36:05 +0100 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2015-11-02 21:36:05 +0100 |
| commit | 6481c721dd96d2e241820fb27b531d2d1ba9f792 (patch) | |
| tree | fe5e38547856727e2e84d4d086f6a41e2443a0c5 /app/Controllers/updateController.php | |
| parent | d7a2a27e44244547620cad7c4e65b50cbf19a574 (diff) | |
| parent | 455e488e791cb0dd64b3b660ed8afa418d6c9641 (diff) | |
Merge branch 'FreshRSS/dev' into dev
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; } |