Some PHP strict warning fixes

diff --git a/classes/User_group.php b/classes/User_group.php
index 4289c51386a262ee769aeff8bbcc973b032b2564..50f4b7ddc7cb232e10e1c5dd60c862f71b6fc746 100644 (file)
--- a/classes/User_group.php
+++ b/classes/User_group.php
@@ -68,7 +68,7 @@ class User_group extends Managed_DataObject
         );
     }
 
-    function defaultLogo($size)
+    public static function defaultLogo($size)
     {
         static $sizenames = array(AVATAR_PROFILE_SIZE => 'profile',
                                   AVATAR_STREAM_SIZE => 'stream',

diff --git a/lib/threadednoticelist.php b/lib/threadednoticelist.php
index 5c45b5a831ba93bd0ec56b695c1d6eec208e7238..c3382897c7b368636b8b967b1ec54f9a0d5a4024 100644 (file)
--- a/lib/threadednoticelist.php
+++ b/lib/threadednoticelist.php
@@ -80,7 +80,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();
         

diff --git a/plugins/Xmpp/XmppPlugin.php b/plugins/Xmpp/XmppPlugin.php
index a5666e5aa6700b045fb656c92c81bb6f8361e63f..8b337a5f2713a7c91bc2c54dbd61651f14b1ccd9 100644 (file)
--- a/plugins/Xmpp/XmppPlugin.php
+++ b/plugins/Xmpp/XmppPlugin.php
@@ -318,7 +318,7 @@ class XmppPlugin extends ImPlugin
         $this->queuedConnection()->message($screenname, $body, 'chat');
     }
 
-    function sendNotice($screenname, $notice)
+    function sendNotice($screenname, Notice $notice)
     {
         $msg   = $this->formatNotice($notice);
         $entry = $this->format_entry($notice);