Merge branch 'riverid-bug' of git://github.com/solarissmoke/Ushahidi_…

…Web into develop Conflicts: application/models/user.php
ushahidi · May 29, 2013 · 4cfa8d1 · 4cfa8d1
2 parents b862e0c + ace866f
commit 4cfa8d1
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/application/models/user.php b/application/models/user.php
@@ -44,10 +44,7 @@ public static function create_user($email, $password, $riverid=FALSE, $name=FALS
 			$user->needinfo = 1;
 		}
 
-		if ($riverid != FALSE)
-		{
-			$user->riverid = $riverid;
-		}
+		$user->riverid = ( $riverid == false ) ? '' : $riverid;
 
 		// Add New Roles if:
 		//    1. We don't require admin to approve users (will be added when admin approves)