]> git.mxchange.org Git - friendica.git/blobdiff - mod/ping.php
Update main translation after translation string change
[friendica.git] / mod / ping.php
index 810598a0b3e5addda5d340df66fed33a86529a41..4a716e58231503aa0156373d89379841ab390397 100644 (file)
@@ -28,7 +28,7 @@ use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Group;
-use Friendica\Model\Notify\Type;
+use Friendica\Model\Notification;
 use Friendica\Model\Post;
 use Friendica\Model\Verb;
 use Friendica\Protocol\Activity;
@@ -412,14 +412,14 @@ function ping_get_notifications($uid)
 
        do {
                $r = q(
-                       "SELECT `notify`.*, `post-view`.`visible`, `post-view`.`deleted`
-                       FROM `notify` LEFT JOIN `post-view` ON `post-view`.`id` = `notify`.`iid`
+                       "SELECT `notify`.*, `post`.`visible`, `post`.`deleted`
+                       FROM `notify` LEFT JOIN `post` ON `post`.`uri-id` = `notify`.`uri-id`
                        WHERE `notify`.`uid` = %d AND `notify`.`msg` != ''
                        AND NOT (`notify`.`type` IN (%d, %d))
                        AND $seensql `notify`.`seen` ORDER BY `notify`.`date` $order LIMIT %d, 50",
                        intval($uid),
-                       intval(Type::INTRO),
-                       intval(Type::MAIL),
+                       intval(Notification\Type::INTRO),
+                       intval(Notification\Type::MAIL),
                        intval($offset)
                );
 
@@ -448,7 +448,7 @@ function ping_get_notifications($uid)
                                $notification["message"] = $notification["msg_cache"];
                        } else {
                                $notification["name"] = strip_tags(BBCode::convert($notification["name"]));
-                               $notification["message"] = Friendica\Model\Notify::formatMessage($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
+                               $notification["message"] = Notification::formatMessage($notification["name"], strip_tags(BBCode::convert($notification["msg"])));
 
                                q(
                                        "UPDATE `notify` SET `name_cache` = '%s', `msg_cache` = '%s' WHERE `id` = %d",