From: Thomas Citharel <tcit@tcit.fr>
Date: Sat, 24 Jan 2015 13:35:36 +0000 (+0100)
Subject: Merge branch 'dev' of github.com:wallabag/wallabag into dev
X-Git-Tag: 1.9beta~28
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e25972f83000bc664c4f3f880ae0a874c6b33f75;hp=0d36d2af955bd2178d11aece8fe1ce1939380934;p=github%2Fwallabag%2Fwallabag.git

Merge branch 'dev' of github.com:wallabag/wallabag into dev
---

diff --git a/inc/poche/Routing.class.php b/inc/poche/Routing.class.php
index be06a433..a8d00b89 100755
--- a/inc/poche/Routing.class.php
+++ b/inc/poche/Routing.class.php
@@ -116,7 +116,7 @@ class Routing
                 // update password
                 $this->wallabag->updatePassword($_POST['password'], $_POST['password_repeat']);
             } elseif (isset($_GET['newuser'])) {
-                $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser']);
+                $this->wallabag->createNewUser($_POST['newusername'], $_POST['password4newuser'], $_POST['newuseremail']);
             } elseif (isset($_GET['deluser'])) {
                 $this->wallabag->deleteUser($_POST['password4deletinguser']);
             } elseif (isset($_GET['epub'])) {