aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNicolas Lœuillet <nicolas@loeuillet.org>2014-02-19 13:56:06 +0100
committerNicolas Lœuillet <nicolas@loeuillet.org>2014-02-19 13:56:06 +0100
commit655214ab30ee84884dc408488b85586f36263fcb (patch)
treed7b855b0a5185fc8e26914b957557c8ebee4ae3d
parent60ca369cd328f4eae31005c547b9419a5ab33324 (diff)
parentfb5a9666ed99abe16b8823a98aed1a6dce03bb04 (diff)
downloadwallabag-655214ab30ee84884dc408488b85586f36263fcb.tar.gz
wallabag-655214ab30ee84884dc408488b85586f36263fcb.tar.zst
wallabag-655214ab30ee84884dc408488b85586f36263fcb.zip
Merge pull request #469 from wallabag/dev
version number 1.5.1
-rw-r--r--index.php2
-rw-r--r--install/index.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/index.php b/index.php
index 7ded3bdb..2c81afd6 100644
--- a/index.php
+++ b/index.php
@@ -8,7 +8,7 @@
8 * @license http://www.wtfpl.net/ see COPYING file 8 * @license http://www.wtfpl.net/ see COPYING file
9 */ 9 */
10 10
11define ('POCHE', '1.5.0'); 11define ('POCHE', '1.5.1');
12require 'check_setup.php'; 12require 'check_setup.php';
13require_once 'inc/poche/global.inc.php'; 13require_once 'inc/poche/global.inc.php';
14session_start(); 14session_start();
diff --git a/install/index.php b/install/index.php
index d2137172..d31bad89 100644
--- a/install/index.php
+++ b/install/index.php
@@ -2,8 +2,8 @@
2$errors = array(); 2$errors = array();
3$successes = array(); 3$successes = array();
4if ($_POST['download']) { 4if ($_POST['download']) {
5 if (!file_put_contents("cache/vendor.zip", fopen("http://wllbg.org/vendor", 'r'))) { 5 if (!file_put_contents("cache/vendor.zip", fopen("http://static.wallabag.org/files/vendor.zip", 'r'))) {
6 $errors[] = 'Impossible to download vendor.zip. Please <a href="http://wllbg.org/vendor">download it here manually<∕a> and unzip it in your wallabag folder.'; 6 $errors[] = 'Impossible to download vendor.zip. Please <a href="http://wllbg.org/vendor">download it manually<∕a> and unzip it in your wallabag folder.';
7 } 7 }
8 else { 8 else {
9 if (extension_loaded('zip')) { 9 if (extension_loaded('zip')) {
@@ -129,7 +129,7 @@ else if ($_POST['install']) {
129 $params = array($id_user, 'language', 'en_EN.UTF8'); 129 $params = array($id_user, 'language', 'en_EN.UTF8');
130 $query = executeQuery($handle, $sql, $params); 130 $query = executeQuery($handle, $sql, $params);
131 131
132 $successes[] = 'wallabag is now installed. Don\'t forget to delete install folder.'; 132 $successes[] = 'wallabag is now installed. Don\'t forget to delete install folder. Then, <a href="index.php">reload this page</a>.';
133 } 133 }
134 } 134 }
135 } 135 }