summaryrefslogtreecommitdiff
path: root/classes/User.php
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-06-08 11:55:32 -0700
committerEvan Prodromou <evan@controlyourself.ca>2009-06-08 11:55:32 -0700
commitadfb79a9bbdfb43f35c0f022c1de6118b10ce115 (patch)
treee14ec0cc5161cfd5cc321eaaa5b8eed07df952de /classes/User.php
parent1a126032efbcb265a59f4d682bd072251f857c97 (diff)
parent265e2bd58de2a01e0d7840310eb44b21b70e3914 (diff)
Merge branch '0.7.x' into 0.8.x
Conflicts: classes/Notice.php classes/Profile.php lib/common.php lib/util.php scripts/getvaliddaemons.php scripts/stopdaemons.sh
Diffstat (limited to 'classes/User.php')
-rw-r--r--classes/User.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/classes/User.php b/classes/User.php
index ea8ba4081..08a166d5a 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -403,7 +403,6 @@ class User extends Memcached_DataObject
function getReplies($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0, $since=null)
{
$ids = Reply::stream($this->id, $offset, $limit, $since_id, $before_id, $since);
- common_debug("Ids = " . implode(',', $ids));
return Notice::getStreamByIds($ids);
}