do some commits
darcs-hash:20080619033212-84dde-2f7227fe16c7015b03121424520ebd74d4b96762.gz
This commit is contained in:
		@@ -122,7 +122,9 @@ class ProfilesettingsAction extends SettingsAction {
 | 
			
		||||
		common_debug('Updating, nickname ="'.$user->nickname.'" and email ="'.$user->email.'"');
 | 
			
		||||
		common_debug('Original, nickname ="'.$original->nickname.'" and email ="'.$original->email.'"');
 | 
			
		||||
		
 | 
			
		||||
		if (FALSE === $user->update($original)) {
 | 
			
		||||
		$result = $user->update($original);
 | 
			
		||||
		
 | 
			
		||||
		if (!$result) {
 | 
			
		||||
			common_server_error(_t('Couldnt update user.'));
 | 
			
		||||
			return;
 | 
			
		||||
		}
 | 
			
		||||
@@ -138,13 +140,17 @@ class ProfilesettingsAction extends SettingsAction {
 | 
			
		||||
		$profile->location = $location;
 | 
			
		||||
		$profile->profileurl = common_profile_url($nickname);
 | 
			
		||||
 | 
			
		||||
		if (FALSE === $profile->update($orig_profile)) {
 | 
			
		||||
		$result = $profile->update($orig_profile);
 | 
			
		||||
		
 | 
			
		||||
		if (!$result) {
 | 
			
		||||
			common_server_error(_t('Couldnt save profile.'));
 | 
			
		||||
			return;
 | 
			
		||||
		}
 | 
			
		||||
 | 
			
		||||
		common_broadcast_profile($profile);
 | 
			
		||||
 | 
			
		||||
		$user->query('COMMIT');
 | 
			
		||||
		
 | 
			
		||||
		$this->show_form(_t('Settings saved.'), TRUE);
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										0
									
								
								classes/stoica.links.ini
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								classes/stoica.links.ini
									
									
									
									
									
										Normal file
									
								
							@@ -8,3 +8,4 @@ class_prefix      =
 | 
			
		||||
db_driver         = DB #Use this if you wish to use MDB2 as the driver
 | 
			
		||||
quote_identifiers = 0
 | 
			
		||||
generator_exclude_regex = /oid_.*/
 | 
			
		||||
generate_links	  = 1
 | 
			
		||||
 
 | 
			
		||||
@@ -51,15 +51,15 @@ function oid_link_user($id, $canonical, $display) {
 | 
			
		||||
	$oid->display = $display;
 | 
			
		||||
	$oid->created = DB_DataObject_Cast::dateTime();
 | 
			
		||||
 | 
			
		||||
    common_debug('oid = '.print_r($oid, TRUE), __FILE__);
 | 
			
		||||
	
 | 
			
		||||
	if (!$oid->insert()) {
 | 
			
		||||
		$err = PEAR::getStaticProperty('DB_DataObject','lastError');
 | 
			
		||||
		common_debug('DB error ' . $err->code . ': ' . $err->message, __FILE__);
 | 
			
		||||
		return false;
 | 
			
		||||
	}
 | 
			
		||||
	
 | 
			
		||||
    common_debug('oid = '.print_r($oid, TRUE), __FILE__);
 | 
			
		||||
	# For some reason, autocommit is turned off
 | 
			
		||||
	
 | 
			
		||||
	$oid->query('COMMIT');
 | 
			
		||||
	
 | 
			
		||||
	return true;
 | 
			
		||||
}
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user