Merge lp:~nathan-unleashed/eventum/usergroup into lp:eventum

Proposed by Nathan Humphreys
Status: Merged
Merged at revision: 4235
Proposed branch: lp:~nathan-unleashed/eventum/usergroup
Merge into: lp:eventum
Diff against target: 19 lines (+2/-0)
1 file modified
lib/eventum/class.user.php (+2/-0)
To merge this branch: bzr merge lp:~nathan-unleashed/eventum/usergroup
Reviewer Review Type Date Requested Status
Eventum Development Team Pending
Review via email: mp+44004@code.launchpad.net

Description of the change

Fixes bug: 691398

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/eventum/class.user.php'
2--- lib/eventum/class.user.php 2010-07-28 08:50:32 +0000
3+++ lib/eventum/class.user.php 2010-12-17 03:46:55 +0000
4@@ -1100,6 +1100,7 @@
5 usr_password,
6 usr_full_name,
7 usr_email,
8+ usr_grp_id,
9 usr_preferences
10 ) VALUES (
11 NULL,
12@@ -1108,6 +1109,7 @@
13 '" . Auth::hashPassword(Misc::escapeString($_POST["password"])) . "',
14 '" . Misc::escapeString($_POST["full_name"]) . "',
15 '" . Misc::escapeString($_POST["email"]) . "',
16+ '" . Misc::escapeString($_POST["grp_id"]) . "',
17 '" . Misc::escapeString($prefs) . "'
18 )";
19 $res = DB_Helper::getInstance()->query($stmt);

Subscribers

People subscribed via source and target branches