Merge pull request #876 from ohmage/ohmage-2.17.1

bugfix user reg

Author: stevenolen

build.xml

@@ -3,7 +3,7 @@
   <property file="build.properties"/>
   <property name="library" location="lib"/>
   <property name="app_name" value="ohmage"/>
-  <property name="app_version" value="2.17.1"/>
+  <property name="app_version" value="2.17.2"/>
   <property name="src" location="src"/>
   <property name="test" location="test"/>
   <property name="view" location="view"/>

src/org/ohmage/query/impl/UserQueries.java

@@ -641,7 +641,7 @@ public void createUserRegistration(
 						new Object[] { 
 								username, 
 								hashedPassword, 
-								//null,
+								null,
 								emailAddress, 
 								false, 
 								false, 
@@ -657,12 +657,13 @@ public void createUserRegistration(
 							SQL_INSERT_USER + 
 							"' with parameters: " +
 							username + ", " + 
-							emailAddress + ", " + 
 							hashedPassword + ", " + 
+							"null" +
+							emailAddress + ", " + 
 							false + ", " + 
 							false + ", " + 
 							false + ", " + 
-							"null", 
+							defaultCampaignCreationPrivilege, 
 						e);
 			}