diff options
| author | Sean Dague | 2008-11-04 19:26:17 +0000 |
|---|---|---|
| committer | Sean Dague | 2008-11-04 19:26:17 +0000 |
| commit | 7d6dc3b0999d5d4dbe0ec560db43a1de047408b7 (patch) | |
| tree | f43f7310cfbbd35788bc473401915710208353b0 /OpenSim/Data/SQLite/SQLiteUserData.cs | |
| parent | - Added stronger persistence tests for BasicUserTests (diff) | |
| download | opensim-SC-7d6dc3b0999d5d4dbe0ec560db43a1de047408b7.zip opensim-SC-7d6dc3b0999d5d4dbe0ec560db43a1de047408b7.tar.gz opensim-SC-7d6dc3b0999d5d4dbe0ec560db43a1de047408b7.tar.bz2 opensim-SC-7d6dc3b0999d5d4dbe0ec560db43a1de047408b7.tar.xz | |
add some null protection on email
From: Sean Dague <sdague@gmail.com>
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteUserData.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteUserData.cs b/OpenSim/Data/SQLite/SQLiteUserData.cs index 50a1d73..369fc51 100644 --- a/OpenSim/Data/SQLite/SQLiteUserData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserData.cs | |||
| @@ -813,7 +813,8 @@ namespace OpenSim.Data.SQLite | |||
| 813 | user.ID = tmp; | 813 | user.ID = tmp; |
| 814 | user.FirstName = (String) row["username"]; | 814 | user.FirstName = (String) row["username"]; |
| 815 | user.SurName = (String) row["surname"]; | 815 | user.SurName = (String) row["surname"]; |
| 816 | user.Email = (String) row["email"]; | 816 | user.Email = (row.IsNull("email")) ? "" : (String) row["email"]; |
| 817 | |||
| 817 | user.PasswordHash = (String) row["passwordHash"]; | 818 | user.PasswordHash = (String) row["passwordHash"]; |
| 818 | user.PasswordSalt = (String) row["passwordSalt"]; | 819 | user.PasswordSalt = (String) row["passwordSalt"]; |
| 819 | 820 | ||