aboutsummaryrefslogtreecommitdiffhomepage
path: root/main/app/sprinkles/admin
diff options
context:
space:
mode:
authorMarvin Borner2018-06-12 19:05:00 +0200
committerMarvin Borner2018-06-12 19:05:00 +0200
commitcc361c5dd29f360e0ec55f49a323230838b70956 (patch)
tree355487f6eb1d152168c5b0edf8b1a5330ec35eeb /main/app/sprinkles/admin
parentf4c8179c9cc35ec3cf4841bbede9e703ab63075e (diff)
Began user page integration
Diffstat (limited to 'main/app/sprinkles/admin')
-rw-r--r--main/app/sprinkles/admin/src/Controller/PostController.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/main/app/sprinkles/admin/src/Controller/PostController.php b/main/app/sprinkles/admin/src/Controller/PostController.php
index cab87cd..f4a1905 100644
--- a/main/app/sprinkles/admin/src/Controller/PostController.php
+++ b/main/app/sprinkles/admin/src/Controller/PostController.php
@@ -67,9 +67,11 @@ class PostController extends SimpleController
foreach ($ImagesFromFriends as $ImageFromFriend) {
$ImageFromFriend->image_url = $config["site.uri.public"] . "/image/" . $ImageFromFriend->image_id;
if ($ImageFromFriend->user_id == $user->id) { // UPLOADED FROM HIMSELF
+ $ImageFromFriend->username = $user->user_name;
$ImageFromFriend->full_name = $user->full_name; // ADD USERNAME TO IMAGE ID
$ImageFromFriend->avatar = $user->avatar;
} else { // UPLOADED FROM ANOTHER USER
+ $ImageFromFriend->username = $UsersFriendInformation[0]->user_name;
$ImageFromFriend->full_name = $UsersFriendInformation[0]->full_name; // ADD USERNAME TO IMAGE ID
$ImageFromFriend->avatar = $UsersFriendInformation[0]->avatar;
}