don't save replies from a blocked profile to the blocking user
darcs-hash:20081208031408-5ed1f-dfdb46fbcf5390d890b4db47c64da0b70ace8096.gz
This commit is contained in:
		
							
								
								
									
										10
									
								
								lib/util.php
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								lib/util.php
									
									
									
									
									
								
							@@ -1401,6 +1401,11 @@ function common_save_replies($notice) {
 | 
				
			|||||||
				$notice->update($orig);
 | 
									$notice->update($orig);
 | 
				
			||||||
			}
 | 
								}
 | 
				
			||||||
		}
 | 
							}
 | 
				
			||||||
 | 
					        # Don't save replies from blocked profile to local user
 | 
				
			||||||
 | 
					        $recipient_user = User::staticGet('id', $recipient->id);
 | 
				
			||||||
 | 
					        if ($recipient_user && $recipient_user->hasBlocked($sender)) {
 | 
				
			||||||
 | 
					            continue;
 | 
				
			||||||
 | 
					        }
 | 
				
			||||||
		$reply = new Reply();
 | 
							$reply = new Reply();
 | 
				
			||||||
		$reply->notice_id = $notice->id;
 | 
							$reply->notice_id = $notice->id;
 | 
				
			||||||
		$reply->profile_id = $recipient->id;
 | 
							$reply->profile_id = $recipient->id;
 | 
				
			||||||
@@ -1422,6 +1427,11 @@ function common_save_replies($notice) {
 | 
				
			|||||||
			$tagged = Profile_tag::getTagged($sender->id, $tag);
 | 
								$tagged = Profile_tag::getTagged($sender->id, $tag);
 | 
				
			||||||
			foreach ($tagged as $t) {
 | 
								foreach ($tagged as $t) {
 | 
				
			||||||
				if (!$replied[$t->id]) {
 | 
									if (!$replied[$t->id]) {
 | 
				
			||||||
 | 
					                    # Don't save replies from blocked profile to local user
 | 
				
			||||||
 | 
					                    $t_user = User::staticGet('id', $t->id);
 | 
				
			||||||
 | 
					                    if ($t_user && $t_user->hasBlocked($sender)) {
 | 
				
			||||||
 | 
					                        continue;
 | 
				
			||||||
 | 
					                    }
 | 
				
			||||||
					$reply = new Reply();
 | 
										$reply = new Reply();
 | 
				
			||||||
					$reply->notice_id = $notice->id;
 | 
										$reply->notice_id = $notice->id;
 | 
				
			||||||
					$reply->profile_id = $t->id;
 | 
										$reply->profile_id = $t->id;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user