Merge branch 'master' of github.com:danmontgomery/codeigniter-bitauth

danmontgomery · danmontgomery · commit a9cd2ffa655c · 2012-01-24T16:42:16.000-05:00
diff --git a/application/libraries/Bitauth.php b/application/libraries/Bitauth.php
@@ -702,14 +702,18 @@ public function update_user($id, $data)
 			}
 		}
 
-		if(isset($data['password']))
+		if(isset($data['password']) AND $data['password'] != '')
 		{
 			$new_password = $this->hash_password($data['password']);
 
 			$data['password'] = $new_password;
 			$data['password_last_set'] = $this->timestamp();
 		}
-
+		else
+		{
+			unset($data['password']);
+		}
+		
 		$this->db->trans_start();
 
 		if( ! empty($data))

Original file line number	Diff line number	Diff line change
`@@ -702,14 +702,18 @@ public function update_user($id, $data)`
`702`	`702`	`}`
`703`	`703`	`}`
`704`	`704`
`705`		`- if(isset($data['password']))`
	`705`	`+ if(isset($data['password']) AND $data['password'] != '')`
`706`	`706`	`{`
`707`	`707`	`$new_password = $this->hash_password($data['password']);`
`708`	`708`
`709`	`709`	`$data['password'] = $new_password;`
`710`	`710`	`$data['password_last_set'] = $this->timestamp();`
`711`	`711`	`}`
`712`		`-`
	`712`	`+ else`
	`713`	`+ {`
	`714`	`+ unset($data['password']);`
	`715`	`+ }`
	`716`	`+`
`713`	`717`	`$this->db->trans_start();`
`714`	`718`
`715`	`719`	`if( ! empty($data))`