prevent duplicate friend suggestions
This commit is contained in:
		
							
								
								
									
										2
									
								
								boot.php
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								boot.php
									
									
									
									
									
								
							| @@ -9,7 +9,7 @@ require_once('include/nav.php'); | |||||||
| require_once('include/cache.php'); | require_once('include/cache.php'); | ||||||
|  |  | ||||||
| define ( 'FRIENDICA_PLATFORM',     'Friendica'); | define ( 'FRIENDICA_PLATFORM',     'Friendica'); | ||||||
| define ( 'FRIENDICA_VERSION',      '2.3.1290' ); | define ( 'FRIENDICA_VERSION',      '2.3.1291' ); | ||||||
| define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    ); | define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    ); | ||||||
| define ( 'DB_UPDATE_VERSION',      1133      ); | define ( 'DB_UPDATE_VERSION',      1133      ); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -1898,6 +1898,14 @@ function local_delivery($importer,$data) { | |||||||
| 		); | 		); | ||||||
| 		if(count($r)) { | 		if(count($r)) { | ||||||
| 			$fid = $r[0]['id']; | 			$fid = $r[0]['id']; | ||||||
|  |  | ||||||
|  | 			// OK, we do. Do we already have an introduction for this person ? | ||||||
|  | 			$r = q("select id from intro where uid = %d and fid = %d limit 1", | ||||||
|  | 				intval($fsugg['uid']), | ||||||
|  | 				intval($fid) | ||||||
|  | 			); | ||||||
|  | 			if(count($r)) | ||||||
|  | 				return 0; | ||||||
| 		} | 		} | ||||||
| 		if(! $fid) | 		if(! $fid) | ||||||
| 			$r = q("INSERT INTO `fcontact` ( `name`,`url`,`photo`,`request` ) VALUES ( '%s', '%s', '%s', '%s' ) ", | 			$r = q("INSERT INTO `fcontact` ( `name`,`url`,`photo`,`request` ) VALUES ( '%s', '%s', '%s', '%s' ) ", | ||||||
| @@ -1918,6 +1926,7 @@ function local_delivery($importer,$data) { | |||||||
| 		else | 		else | ||||||
| 			return 0; | 			return 0; | ||||||
|  |  | ||||||
|  |  | ||||||
| 		$hash = random_string(); | 		$hash = random_string(); | ||||||
|   |   | ||||||
| 		$r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` ) | 		$r = q("INSERT INTO `intro` ( `uid`, `fid`, `contact-id`, `note`, `hash`, `datetime`, `blocked` ) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user