| 
                                                        @@ -133,7 +133,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    133
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    133
                                                                                                                                                                                                 | 
                                                             		$subject = '';  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    134
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    134
                                                                                                                                                                                                 | 
                                                             		switch ($subjectIdentifier) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    135
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    135
                                                                                                                                                                                                 | 
                                                             			case self::SUBJECT_BOARD_CREATE:  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    136
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -				$subject = $ownActivity ? $this->l10n->t('You have created a new board {board}'): $this->l10n->t('{user} has created a new board {board}'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    136
                                                                                                                                                                                                 | 
                                                            +				$subject = $ownActivity ? $this->l10n->t('You have created a new board {board}') : $this->l10n->t('{user} has created a new board {board}'); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    137
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    137
                                                                                                                                                                                                 | 
                                                             				break;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    138
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    138
                                                                                                                                                                                                 | 
                                                             			case self::SUBJECT_BOARD_DELETE:  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    139
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    139
                                                                                                                                                                                                 | 
                                                             				$subject = $ownActivity ? $this->l10n->t('You have deleted the board {board}') : $this->l10n->t('{user} has deleted the board {board}'); | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -302,10 +302,10 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    302
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    302
                                                                                                                                                                                                 | 
                                                             		try { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    303
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    303
                                                                                                                                                                                                 | 
                                                             			$object = $this->findObjectForEntity($objectType, $entity);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    304
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    304
                                                                                                                                                                                                 | 
                                                             		} catch (DoesNotExistException $e) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    305
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			\OC::$server->getLogger()->error('Could not create activity entry for ' . $subject . '. Entity not found.', (array)$entity); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    305
                                                                                                                                                                                                 | 
                                                            +			\OC::$server->getLogger()->error('Could not create activity entry for ' . $subject . '. Entity not found.', (array) $entity); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    306
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    306
                                                                                                                                                                                                 | 
                                                             			return null;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    307
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    307
                                                                                                                                                                                                 | 
                                                             		} catch (MultipleObjectsReturnedException $e) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    308
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			\OC::$server->getLogger()->error('Could not create activity entry for ' . $subject . '. Entity not found.', (array)$entity); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    308
                                                                                                                                                                                                 | 
                                                            +			\OC::$server->getLogger()->error('Could not create activity entry for ' . $subject . '. Entity not found.', (array) $entity); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    309
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    309
                                                                                                                                                                                                 | 
                                                             			return null;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    310
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    310
                                                                                                                                                                                                 | 
                                                             		}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    311
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    311
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -375,7 +375,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    375
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    375
                                                                                                                                                                                                 | 
                                                             				break;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    376
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    376
                                                                                                                                                                                                 | 
                                                             		}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    377
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    377
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    378
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		if ($subject === self::SUBJECT_CARD_UPDATE_DESCRIPTION){ | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    378
                                                                                                                                                                                                 | 
                                                            +		if ($subject === self::SUBJECT_CARD_UPDATE_DESCRIPTION) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    379
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    379
                                                                                                                                                                                                 | 
                                                             			$card = $subjectParams['card'];  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    380
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    380
                                                                                                                                                                                                 | 
                                                             			if ($card->getLastEditor() === $this->userId) { | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    381
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    381
                                                                                                                                                                                                 | 
                                                             				return null;  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -394,7 +394,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    394
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    394
                                                                                                                                                                                                 | 
                                                             		$event->setApp('deck') | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    395
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    395
                                                                                                                                                                                                 | 
                                                             			->setType($eventType)  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    396
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    396
                                                                                                                                                                                                 | 
                                                             			->setAuthor($author === null ? $this->userId : $author)  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    397
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -			->setObject($objectType, (int)$object->getId(), $object->getTitle())  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    397
                                                                                                                                                                                                 | 
                                                            +			->setObject($objectType, (int) $object->getId(), $object->getTitle())  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    398
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    398
                                                                                                                                                                                                 | 
                                                             			->setSubject($subject, array_merge($subjectParams, $additionalParams))  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    399
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    399
                                                                                                                                                                                                 | 
                                                             			->setTimestamp(time());  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    400
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    400
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -455,7 +455,7 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    455
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    455
                                                                                                                                                                                                 | 
                                                             					$objectId = $entity->getObjectId();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    456
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    456
                                                                                                                                                                                                 | 
                                                             					break;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    457
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    457
                                                                                                                                                                                                 | 
                                                             				default:  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    458
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -					throw new InvalidArgumentException('No entity relation present for '. $className . ' to ' . $objectType); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    458
                                                                                                                                                                                                 | 
                                                            +					throw new InvalidArgumentException('No entity relation present for ' . $className . ' to ' . $objectType); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    459
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    459
                                                                                                                                                                                                 | 
                                                             			}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    460
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    460
                                                                                                                                                                                                 | 
                                                             			return $this->cardMapper->find($objectId);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    461
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    461
                                                                                                                                                                                                 | 
                                                             		}  | 
                                                        
                                                                                                                                                        
                                                         | 
                                                        @@ -470,11 +470,11 @@  discard block  | 
                                                    
                                                    
                                                         | 
                                                         | 
                                                         block discarded – undo  | 
                                                    
                                                                                                                                                                                                                    
                                                            | 
                                                                                                                                    470
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    470
                                                                                                                                                                                                 | 
                                                             					$objectId = $entity->getBoardId();  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    471
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    471
                                                                                                                                                                                                 | 
                                                             					break;  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    472
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    472
                                                                                                                                                                                                 | 
                                                             				default:  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    473
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -					throw new InvalidArgumentException('No entity relation present for '. $className . ' to ' . $objectType); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    473
                                                                                                                                                                                                 | 
                                                            +					throw new InvalidArgumentException('No entity relation present for ' . $className . ' to ' . $objectType); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    474
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    474
                                                                                                                                                                                                 | 
                                                             			}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    475
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    475
                                                                                                                                                                                                 | 
                                                             			return $this->boardMapper->find($objectId);  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    476
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    476
                                                                                                                                                                                                 | 
                                                             		}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    477
                                                                                                                                                                                                 | 
                                                            
                                                                                                                             | 
                                                            -		throw new InvalidArgumentException('No entity relation present for '. $className . ' to ' . $objectType); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                             | 
                                                            
                                                                                                                                    477
                                                                                                                                                                                                 | 
                                                            +		throw new InvalidArgumentException('No entity relation present for ' . $className . ' to ' . $objectType); | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    478
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    478
                                                                                                                                                                                                 | 
                                                             	}  | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    479
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    479
                                                                                                                                                                                                 | 
                                                               | 
                                                        
                                                                                                            
                                                            | 
                                                                                                                                    480
                                                                                                                                                                                                 | 
                                                            
                                                                                                                                    480
                                                                                                                                                                                                 | 
                                                             	private function findDetailsForStack($stackId) { |