forked from GNUsocial/gnu-social
		
	allow blank email address (I think)
darcs-hash:20080622165453-34904-a3bdd2557622e6db3aef88371c22586e2d2fed07.gz
This commit is contained in:
		@@ -80,7 +80,7 @@ class ProfilesettingsAction extends SettingsAction {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
		# Some validation
 | 
							# Some validation
 | 
				
			||||||
		
 | 
							
 | 
				
			||||||
		if (!Validate::email($email, true)) {
 | 
							if (!is_null($email) && !Validate::email($email, true)) {
 | 
				
			||||||
			$this->show_form(_t('Not a valid email address.'));
 | 
								$this->show_form(_t('Not a valid email address.'));
 | 
				
			||||||
			return;
 | 
								return;
 | 
				
			||||||
		} else if (!Validate::string($nickname, array('min_length' => 1,
 | 
							} else if (!Validate::string($nickname, array('min_length' => 1,
 | 
				
			||||||
@@ -113,7 +113,7 @@ class ProfilesettingsAction extends SettingsAction {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
		$user->query('BEGIN');
 | 
							$user->query('BEGIN');
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (strcmp($user->nickname, $nickname) != 0) {
 | 
							if ($user->nickname != $nickname) {
 | 
				
			||||||
			
 | 
								
 | 
				
			||||||
			common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname,
 | 
								common_debug('Updating user nickname from ' . $user->nickname . ' to ' . $nickname,
 | 
				
			||||||
						 __FILE__);
 | 
											 __FILE__);
 | 
				
			||||||
@@ -131,7 +131,7 @@ class ProfilesettingsAction extends SettingsAction {
 | 
				
			|||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		if (strcmp($user->email, $email) != 0) {
 | 
							if ($user->email != $email) {
 | 
				
			||||||
			
 | 
								
 | 
				
			||||||
			common_debug('Updating user email from ' . $user->email . ' to ' . $email,
 | 
								common_debug('Updating user email from ' . $user->email . ' to ' . $email,
 | 
				
			||||||
						 __FILE__);
 | 
											 __FILE__);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user