From: Evan Prodromou <evan@status.net>
Date: Fri, 25 Mar 2011 20:18:10 +0000 (-0400)
Subject: Merge branch '1.0.x' into limitdist2
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=d69f912b00ff66e6b315599ce52d6992ac43d19a;p=quix0rs-gnu-social.git

Merge branch '1.0.x' into limitdist2
---

d69f912b00ff66e6b315599ce52d6992ac43d19a
diff --cc lib/publicnoticestream.php
index 19d0ad96a0,6a861ca26e..5c8d313d46
--- a/lib/publicnoticestream.php
+++ b/lib/publicnoticestream.php
@@@ -54,20 -8,9 +54,20 @@@ class PublicNoticeStream extends Scopin
      }
  }
  
 +/**
 + * Raw public stream
 + *
 + * @category  Stream
 + * @package   StatusNet
 + * @author    Evan Prodromou <evan@status.net>
 + * @copyright 2011 StatusNet, Inc.
 + * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
 + * @link      http://status.net/
 + */
 +
  class RawPublicNoticeStream extends NoticeStream
  {
-     function getNoticeIds($offset=0, $limit=20, $since_id=0, $max_id=0)
+     function getNoticeIds($offset, $limit, $since_id, $max_id)
      {
          $notice = new Notice();