forked from GNUsocial/gnu-social
		
	Merge commit 'refs/merge-requests/28' of https://gitorious.org/social/mainline into merge-requests/28
This commit is contained in:
		@@ -1342,7 +1342,7 @@ class OStatusPlugin extends Plugin
 | 
				
			|||||||
    static public function onCheckActivityAuthorship(Activity $activity, Profile &$profile)
 | 
					    static public function onCheckActivityAuthorship(Activity $activity, Profile &$profile)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        try {
 | 
					        try {
 | 
				
			||||||
            $oprofile = Ostatus_profile::ensureProfileURI($profile->getUri());
 | 
					            $oprofile = Ostatus_profile::ensureProfileURL($profile->getUrl());
 | 
				
			||||||
            $profile = $oprofile->checkAuthorship($activity);
 | 
					            $profile = $oprofile->checkAuthorship($activity);
 | 
				
			||||||
        } catch (Exception $e) {
 | 
					        } catch (Exception $e) {
 | 
				
			||||||
            common_log(LOG_ERR, 'Could not get a profile or check authorship ('.get_class($e).': "'.$e->getMessage().'") for activity ID: '.$activity->id);
 | 
					            common_log(LOG_ERR, 'Could not get a profile or check authorship ('.get_class($e).': "'.$e->getMessage().'") for activity ID: '.$activity->id);
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user