aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-23 15:12:53 +0100
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2013-12-23 15:12:53 +0100
commitb8d40a6b4e756233f94da25251715801de7c2cb6 (patch)
treeda029ab1fb9e7b3a4c19fdf1b7a806d8e34e9f53
parent108ee3fea2f3090a612c173d00d590288e404c75 (diff)
parent992b9c15def84c1cb1952d016bf57707544e3eac (diff)
Merge remote-tracking branch 'origin/dev' into beta
-rw-r--r--CHANGELOG2
-rw-r--r--public/install.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 0b7350b2e..af6936204 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -50,7 +50,7 @@
* Déplacement de “./app/configuration/application.ini” vers “./data/config.php”
* Déplacement de “./public/data/Configuration.array.php” vers “./data/*_user.php”
* Divers :
- * Nouvel “agent utilisateur” utilisé lors du téléchargement des flux, par exemple :
+ * Nouvel “agent utilisateur” exposé lors du téléchargement des flux, par exemple :
* “FreshRSS/0.7 (Linux; http://freshrss.org) SimplePie/1.3.1”
diff --git a/public/install.php b/public/install.php
index 642692cd0..56d626cc5 100644
--- a/public/install.php
+++ b/public/install.php
@@ -211,7 +211,7 @@ function saveStep2 () {
if (!empty ($_POST)) {
if (empty ($_POST['title']) ||
empty ($_POST['old_entries']) ||
- empty ($_POST['default_user']) {
+ empty ($_POST['default_user'])) {
return false;
}