Completed
Pull Request — master (#1024)
by
unknown
48s
created
lib/Model/ShareWrapper.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -403,9 +403,9 @@  discard block
 block discarded – undo
403 403
 
404 404
 		$display = $circle->getDisplayName();
405 405
 		if ($circle->getSource() === Member::TYPE_CIRCLE) {
406
-			$display .= ' (Circle owned by ' . $circle->getOwner()->getDisplayName() . ')';
406
+			$display .= ' (Circle owned by '.$circle->getOwner()->getDisplayName().')';
407 407
 		} else {
408
-			$display .= ' (' . Circle::$DEF_SOURCE[$circle->getSource()] . ')';
408
+			$display .= ' ('.Circle::$DEF_SOURCE[$circle->getSource()].')';
409 409
 		}
410 410
 
411 411
 		$share->setSharedWithDisplayName($display);
@@ -502,20 +502,20 @@  discard block
 block discarded – undo
502 502
 
503 503
 	public function importFromDatabase(array $data, string $prefix = ''): IQueryRow {
504 504
 		$shareTime = new DateTime();
505
-		$shareTime->setTimestamp($this->getInt($prefix . 'stime', $data));
506
-
507
-		$this->setId($this->get($prefix . 'id', $data))
508
-			 ->setShareType($this->getInt($prefix . 'share_type', $data))
509
-			 ->setPermissions($this->getInt($prefix . 'permissions', $data))
510
-			 ->setItemType($this->get($prefix . 'item_type', $data))
511
-			 ->setItemSource($this->getInt($prefix . 'item_source', $data))
512
-			 ->setItemTarget($this->get($prefix . 'item_target', $data))
513
-			 ->setFileSource($this->getInt($prefix . 'file_source', $data))
514
-			 ->setFileTarget($this->get($prefix . 'file_target', $data))
515
-			 ->setSharedWith($this->get($prefix . 'share_with', $data))
516
-			 ->setSharedBy($this->get($prefix . 'uid_initiator', $data))
517
-			 ->setShareOwner($this->get($prefix . 'uid_owner', $data))
518
-			 ->setToken($this->get($prefix . 'token', $data))
505
+		$shareTime->setTimestamp($this->getInt($prefix.'stime', $data));
506
+
507
+		$this->setId($this->get($prefix.'id', $data))
508
+			 ->setShareType($this->getInt($prefix.'share_type', $data))
509
+			 ->setPermissions($this->getInt($prefix.'permissions', $data))
510
+			 ->setItemType($this->get($prefix.'item_type', $data))
511
+			 ->setItemSource($this->getInt($prefix.'item_source', $data))
512
+			 ->setItemTarget($this->get($prefix.'item_target', $data))
513
+			 ->setFileSource($this->getInt($prefix.'file_source', $data))
514
+			 ->setFileTarget($this->get($prefix.'file_target', $data))
515
+			 ->setSharedWith($this->get($prefix.'share_with', $data))
516
+			 ->setSharedBy($this->get($prefix.'uid_initiator', $data))
517
+			 ->setShareOwner($this->get($prefix.'uid_owner', $data))
518
+			 ->setToken($this->get($prefix.'token', $data))
519 519
 			 ->setShareTime($shareTime);
520 520
 
521 521
 //		if (($password = $this->get('personal_password', $data, '')) !== '') {
@@ -524,9 +524,9 @@  discard block
 block discarded – undo
524 524
 //			$share->setPassword($this->get('password', $data, ''));
525 525
 //		}
526 526
 
527
-		$this->setChildId($this->getInt($prefix . 'child_id', $data))
528
-			 ->setChildFileTarget($this->get($prefix . 'child_file_target', $data))
529
-			 ->setChildPermissions($this->getInt($prefix . 'child_permissions', $data))
527
+		$this->setChildId($this->getInt($prefix.'child_id', $data))
528
+			 ->setChildFileTarget($this->get($prefix.'child_file_target', $data))
529
+			 ->setChildPermissions($this->getInt($prefix.'child_permissions', $data))
530 530
 			 ->setProviderId(ShareByCircleProvider::IDENTIFIER)
531 531
 			 ->setStatus(Ishare::STATUS_ACCEPTED);
532 532
 
Please login to merge, or discard this patch.