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 1154206d3c080a22d25079e3fac63778f9c9cc25..8e4d2a76e9e696e30206818db8a6892210e62939 100644 (file)
--- 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)) {