aboutsummaryrefslogtreecommitdiffhomepage
path: root/main/app/sprinkles/admin/src
diff options
context:
space:
mode:
authorMarvin Borner2018-06-01 23:47:49 +0200
committerMarvin Borner2018-06-01 23:47:49 +0200
commit936bdb59739a65a2f57cc9bf24ff6b5e58a4179e (patch)
treed72324d96fe94e3faaa5ffa89de7537540e7fea3 /main/app/sprinkles/admin/src
parentaf3159f970c503c432739ac81620004bfaca406c (diff)
Several minor fixes regarding stability - mainly in chat
Diffstat (limited to 'main/app/sprinkles/admin/src')
-rw-r--r--main/app/sprinkles/admin/src/Controller/PostController.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/main/app/sprinkles/admin/src/Controller/PostController.php b/main/app/sprinkles/admin/src/Controller/PostController.php
index 06d205d..d6a049f 100644
--- a/main/app/sprinkles/admin/src/Controller/PostController.php
+++ b/main/app/sprinkles/admin/src/Controller/PostController.php
@@ -59,7 +59,8 @@ class PostController extends SimpleController
->get();
$ImagesFromFriends = DB::table('image_posts')
- ->where('UserID', '=', $UsersFriendInformation[0]->id)
+ ->where('UserID', '=', $UsersFriendInformation[0]->id) // IMAGES FROM FRIENDS
+ ->orWhere('UserId', '=', $user->id) // IMAGES FROM THE USER HIMSELF
->select('PostID as image_id')
->get();