Some corrections
This commit is contained in:
		
					parent
					
						
							
								8b775d48f9
							
						
					
				
			
			
				commit
				
					
						3bb5a416f8
					
				
			
		
					 3 changed files with 3 additions and 2 deletions
				
			
		| 
						 | 
				
			
			@ -148,7 +148,7 @@ function message_content(App $a)
 | 
			
		|||
 | 
			
		||||
		$cmd = $a->argv[1];
 | 
			
		||||
		if ($cmd === 'drop') {
 | 
			
		||||
			if (dba::delete('mail', ['id' => $a->argv[2]])) {
 | 
			
		||||
			if (dba::delete('mail', ['id' => $a->argv[2], 'uid' => local_user()])) {
 | 
			
		||||
				info(L10n::t('Message deleted.') . EOL);
 | 
			
		||||
			}
 | 
			
		||||
			//goaway(System::baseUrl(true) . '/message' );
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -149,7 +149,7 @@ function settings_post(App $a)
 | 
			
		|||
		check_form_security_token_redirectOnErr('/settings/oauth', 'settings_oauth');
 | 
			
		||||
 | 
			
		||||
		$key = $_POST['remove'];
 | 
			
		||||
		dba::delete('tokens', ['id' => $key]);
 | 
			
		||||
		dba::delete('tokens', ['id' => $key, 'uid' => local_user()]);
 | 
			
		||||
		goaway(System::baseUrl(true)."/settings/oauth/");
 | 
			
		||||
		return;
 | 
			
		||||
	}
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2094,6 +2094,7 @@ class DFRN
 | 
			
		|||
			'confirm' => $relocate["confirm"], 'notify' => $relocate["notify"],
 | 
			
		||||
			'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]];
 | 
			
		||||
		$condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], normalise_link($old["url"])];
 | 
			
		||||
		dba::update('contact', $fields, $condition);
 | 
			
		||||
 | 
			
		||||
		// @TODO No dba:update here?
 | 
			
		||||
		dba::update('contact', $fields, $condition);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue