From: Roland Häder <Quix0r@users.noreply.github.com>
Date: Sun, 22 Jul 2018 23:25:07 +0000 (+0200)
Subject: Need to load "verb" from notify table, too. This whole thing is a maintenance (#5459)
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d3144e283749877d49910d66cc6cc81f15ec1e04;p=friendica.git

Need to load "verb" from notify table, too. This whole thing is a maintenance (#5459)

nightmare. Let's use the new database frontend/backend system and load all
columns anywhere the "entity" is requested.
---

diff --git a/src/Core/NotificationsManager.php b/src/Core/NotificationsManager.php
index 1154206d3c..8e4d2a76e9 100644
--- a/src/Core/NotificationsManager.php
+++ b/src/Core/NotificationsManager.php
@@ -402,6 +402,7 @@ class NotificationsManager extends BaseObject
 		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
 			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
 		$params = ['order' => ['created' => true], 'limit' => [$start, $limit]];
+
 		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
 
 		if (DBM::is_result($items)) {
@@ -439,12 +440,13 @@ class NotificationsManager extends BaseObject
 		}
 
 		$r = q(
-			"SELECT `id`, `url`, `photo`, `msg`, `date`, `seen` FROM `notify`
+			"SELECT `id`, `url`, `photo`, `msg`, `date`, `seen`, `verb` FROM `notify`
 				WHERE `uid` = %d $sql_seen ORDER BY `date` DESC LIMIT %d, %d ",
 			intval(local_user()),
 			intval($start),
 			intval($limit)
 		);
+
 		if (DBM::is_result($r)) {
 			$notifs = $this->formatNotifs($r, $ident);
 		}
@@ -487,6 +489,7 @@ class NotificationsManager extends BaseObject
 		$fields = ['id', 'parent', 'verb', 'author-name', 'unseen', 'author-link', 'author-avatar', 'contact-avatar',
 			'network', 'created', 'object', 'parent-author-name', 'parent-author-link', 'parent-guid'];
 		$params = ['order' => ['created' => true], 'limit' => [$start, $limit]];
+
 		$items = Item::selectForUser(local_user(), $fields, $condition, $params);
 
 		if (DBM::is_result($items)) {