|  | @@ -466,7 +466,7 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 466 | 466 |  			$l10n = Server::get(IFactory::class)->get('circles'); | 
                                                                                                            
                                                            | 467 | 467 |  			$display = $l10n->t('%s (Team owned by %s)', [$display, $circle->getOwner()->getDisplayName()]); | 
                                                                                                            
                                                            | 468 | 468 |  		} else { | 
                                                                                                            
                                                            | 469 |  | -			$display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')'; | 
                                                                                                            
                                                            |  | 469 | +			$display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')'; | 
                                                                                                            
                                                            | 470 | 470 |  		} | 
                                                                                                            
                                                            | 471 | 471 |   | 
                                                                                                            
                                                            | 472 | 472 |  		$share->setSharedWithDisplayName($display); | 
                                                                                                                                                        
                                                        |  | @@ -556,22 +556,22 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 556 | 556 |   | 
                                                                                                            
                                                            | 557 | 557 |  	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow { | 
                                                                                                            
                                                            | 558 | 558 |  		$shareTime = new DateTime(); | 
                                                                                                            
                                                            | 559 |  | -		$shareTime->setTimestamp($this->getInt($prefix . 'stime', $data)); | 
                                                                                                            
                                                            | 560 |  | - | 
                                                                                                            
                                                            | 561 |  | -		$this->setId($this->get($prefix . 'id', $data)) | 
                                                                                                            
                                                            | 562 |  | -			->setShareType($this->getInt($prefix . 'share_type', $data)) | 
                                                                                                            
                                                            | 563 |  | -			->setPermissions($this->getInt($prefix . 'permissions', $data)) | 
                                                                                                            
                                                            | 564 |  | -			->setItemType($this->get($prefix . 'item_type', $data)) | 
                                                                                                            
                                                            | 565 |  | -			->setItemSource($this->getInt($prefix . 'item_source', $data)) | 
                                                                                                            
                                                            | 566 |  | -			->setItemTarget($this->get($prefix . 'item_target', $data)) | 
                                                                                                            
                                                            | 567 |  | -			->setFileSource($this->getInt($prefix . 'file_source', $data)) | 
                                                                                                            
                                                            | 568 |  | -			->setFileTarget($this->get($prefix . 'file_target', $data)) | 
                                                                                                            
                                                            | 569 |  | -			->setSharedWith($this->get($prefix . 'share_with', $data)) | 
                                                                                                            
                                                            | 570 |  | -			->setSharedBy($this->get($prefix . 'uid_initiator', $data)) | 
                                                                                                            
                                                            | 571 |  | -			->setShareOwner($this->get($prefix . 'uid_owner', $data)) | 
                                                                                                            
                                                            | 572 |  | -			->setToken($this->get($prefix . 'token', $data)) | 
                                                                                                            
                                                            |  | 559 | +		$shareTime->setTimestamp($this->getInt($prefix.'stime', $data)); | 
                                                                                                            
                                                            |  | 560 | + | 
                                                                                                            
                                                            |  | 561 | +		$this->setId($this->get($prefix.'id', $data)) | 
                                                                                                            
                                                            |  | 562 | +			->setShareType($this->getInt($prefix.'share_type', $data)) | 
                                                                                                            
                                                            |  | 563 | +			->setPermissions($this->getInt($prefix.'permissions', $data)) | 
                                                                                                            
                                                            |  | 564 | +			->setItemType($this->get($prefix.'item_type', $data)) | 
                                                                                                            
                                                            |  | 565 | +			->setItemSource($this->getInt($prefix.'item_source', $data)) | 
                                                                                                            
                                                            |  | 566 | +			->setItemTarget($this->get($prefix.'item_target', $data)) | 
                                                                                                            
                                                            |  | 567 | +			->setFileSource($this->getInt($prefix.'file_source', $data)) | 
                                                                                                            
                                                            |  | 568 | +			->setFileTarget($this->get($prefix.'file_target', $data)) | 
                                                                                                            
                                                            |  | 569 | +			->setSharedWith($this->get($prefix.'share_with', $data)) | 
                                                                                                            
                                                            |  | 570 | +			->setSharedBy($this->get($prefix.'uid_initiator', $data)) | 
                                                                                                            
                                                            |  | 571 | +			->setShareOwner($this->get($prefix.'uid_owner', $data)) | 
                                                                                                            
                                                            |  | 572 | +			->setToken($this->get($prefix.'token', $data)) | 
                                                                                                            
                                                            | 573 | 573 |  			->setShareTime($shareTime) | 
                                                                                                            
                                                            | 574 |  | -			->setShareNote($this->get($prefix . 'note', $data)); | 
                                                                                                            
                                                            |  | 574 | +			->setShareNote($this->get($prefix.'note', $data)); | 
                                                                                                            
                                                            | 575 | 575 |   | 
                                                                                                            
                                                            | 576 | 576 |  		try { | 
                                                                                                            
                                                            | 577 | 577 |  			$this->setExpirationDate(new DateTime($this->get('expiration', $data))); | 
                                                                                                                                                        
                                                        |  | @@ -586,9 +586,9 @@  discard block | 
                                                    
                                                        |  |  |  block discarded – undo | 
                                                                                                                                                                                                                    
                                                            | 586 | 586 |  		//			$share->setPassword($this->get('password', $data, '')); | 
                                                                                                            
                                                            | 587 | 587 |  		//		} | 
                                                                                                            
                                                            | 588 | 588 |   | 
                                                                                                            
                                                            | 589 |  | -		$this->setChildId($this->getInt($prefix . 'child_id', $data)) | 
                                                                                                            
                                                            | 590 |  | -			->setChildFileTarget($this->get($prefix . 'child_file_target', $data)) | 
                                                                                                            
                                                            | 591 |  | -			->setChildPermissions($this->getInt($prefix . 'child_permissions', $data)) | 
                                                                                                            
                                                            |  | 589 | +		$this->setChildId($this->getInt($prefix.'child_id', $data)) | 
                                                                                                            
                                                            |  | 590 | +			->setChildFileTarget($this->get($prefix.'child_file_target', $data)) | 
                                                                                                            
                                                            |  | 591 | +			->setChildPermissions($this->getInt($prefix.'child_permissions', $data)) | 
                                                                                                            
                                                            | 592 | 592 |  			->setProviderId(ShareByCircleProvider::IDENTIFIER) | 
                                                                                                            
                                                            | 593 | 593 |  			->setStatus(Ishare::STATUS_ACCEPTED); | 
                                                                                                            
                                                            | 594 | 594 |   |