From: Thomas Citharel <tcit@tcit.fr>
Date: Sun, 1 Mar 2015 20:56:01 +0000 (+0100)
Subject: fix eventual bugs when user exists in database and connection doesn't work
X-Git-Tag: 1.9.1alpha1~10
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=5395d7f8f59ffa54996f908c48925fcc635cc92a;p=github%2Fwallabag%2Fwallabag.git

fix eventual bugs when user exists in database and connection doesn't work
---

diff --git a/install/index.php b/install/index.php
index d514eb2a..24577aaa 100755
--- a/install/index.php
+++ b/install/index.php
@@ -127,6 +127,13 @@ else if (isset($_POST['install'])) {
             }
             // create database structure
             $query = $handle->exec($sql_structure);
+
+            $usertest = executeQuery($handle,"SELECT * from users WHERE username = ?", array($username));
+            if (!empty($usertest)) {
+                $continue = false;
+                $errors[] = "An user already exists with this username in database.";
+            }
+
         } catch (PDOException $e) {
             $errors[] = $e->getMessage();
             $continue = false;
@@ -134,13 +141,6 @@ else if (isset($_POST['install'])) {
         }
     }
 
-    $usertest = executeQuery($handle,"SELECT * from users WHERE username = ?", array($username));
-    if (!empty($usertest)) {
-        $continue = false;
-        $errors[] = "An user already exists with this username in database.";
-    }
-
-
     if ($continue) {
         $sql = "INSERT INTO users (username, password, name, email) VALUES (?, ?, ?, ?)";
         $params = array($username, $salted_password, $username, $email);