1
0
mirror of https://github.com/moparisthebest/wallabag synced 2024-11-23 17:42:15 -05:00

Merge pull request #469 from wallabag/dev

version number 1.5.1
This commit is contained in:
Nicolas Lœuillet 2014-02-19 13:56:06 +01:00
commit 655214ab30
2 changed files with 4 additions and 4 deletions

View File

@ -8,7 +8,7 @@
* @license http://www.wtfpl.net/ see COPYING file
*/
define ('POCHE', '1.5.0');
define ('POCHE', '1.5.1');
require 'check_setup.php';
require_once 'inc/poche/global.inc.php';
session_start();

View File

@ -2,8 +2,8 @@
$errors = array();
$successes = array();
if ($_POST['download']) {
if (!file_put_contents("cache/vendor.zip", fopen("http://wllbg.org/vendor", 'r'))) {
$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.';
if (!file_put_contents("cache/vendor.zip", fopen("http://static.wallabag.org/files/vendor.zip", 'r'))) {
$errors[] = 'Impossible to download vendor.zip. Please <a href="http://wllbg.org/vendor">download it manually<a> and unzip it in your wallabag folder.';
}
else {
if (extension_loaded('zip')) {
@ -129,7 +129,7 @@ else if ($_POST['install']) {
$params = array($id_user, 'language', 'en_EN.UTF8');
$query = executeQuery($handle, $sql, $params);
$successes[] = 'wallabag is now installed. Don\'t forget to delete install folder.';
$successes[] = 'wallabag is now installed. Don\'t forget to delete install folder. Then, <a href="index.php">reload this page</a>.';
}
}
}