Merge branch '0.8.x' into userdesign

Conflicts:
	actions/designsettings.php
This commit is contained in:
Evan Prodromou
2009-06-09 21:51:24 -07:00
66 changed files with 2641 additions and 799 deletions

View File

@@ -402,7 +402,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);
}