use intval() instead of floor() for int return type

[quix0rs-gnu-social.git] / lib / threadednoticelist.php

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index f0854767d6cc153657a2333c2bada01328bb73ae..6d8570fbee6a5c422eeb186fae31e5ed755cec17 100644 (file)
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -27,9 +27,7 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL') && !defined('STATUSNET')) { exit(1); }
 
 /**
  * widget for displaying a list of notices
@@ -80,7 +78,8 @@ class ThreadedNoticeList extends NoticeList
                $total = count($notices);
                $notices = array_slice($notices, 0, NOTICES_PER_PAGE);
                
-       self::prefill(self::_allNotices($notices));
+        $allnotices = self::_allNotices($notices);
+       self::prefill($allnotices);
        
         $conversations = array();
         
@@ -89,7 +88,7 @@ class ThreadedNoticeList extends NoticeList
             // Collapse repeats into their originals...
             
             if ($notice->repeat_of) {
-                $orig = Notice::staticGet('id', $notice->repeat_of);
+                $orig = Notice::getKV('id', $notice->repeat_of);
                 if ($orig) {
                     $notice = $orig;
                 }
@@ -130,7 +129,7 @@ class ThreadedNoticeList extends NoticeList
             $convId[] = $notice->conversation;
         }
         $convId = array_unique($convId);
-        $allMap = Memcached_DataObject::listGet('Notice', 'conversation', $convId);
+        $allMap = Notice::listGet('conversation', $convId);
         $allArray = array();
         foreach ($allMap as $convId => $convNotices) {
             $allArray = array_merge($allArray, $convNotices);
@@ -436,7 +435,7 @@ abstract class NoticeListActorsItem extends NoticeListItem
                 // TRANS: Reference to the logged in user in favourite list.
                 array_unshift($links, _m('FAVELIST', 'You'));
             } else {
-                $profile = Profile::staticGet('id', $id);
+                $profile = Profile::getKV('id', $id);
                 if ($profile) {
                     $links[] = sprintf('<a href="%s">%s</a>',
                                        htmlspecialchars($profile->profileurl),