diff --git a/actions/showgroup.php b/actions/showgroup.php index 21256294f3..a38945c131 100644 --- a/actions/showgroup.php +++ b/actions/showgroup.php @@ -195,7 +195,7 @@ class ShowgroupAction extends GroupDesignAction $notice = $this->group->getNotices(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1); - $nl = new NoticeList($notice, $this); + $nl = new ThreadedNoticeList($notice, $this); $cnt = $nl->show(); $this->pagination($this->page > 1, diff --git a/classes/Profile.php b/classes/Profile.php index 2ad302ccb8..88edf5cbb3 100644 --- a/classes/Profile.php +++ b/classes/Profile.php @@ -186,6 +186,10 @@ class Profile extends Memcached_DataObject $notice = $this->getNotices(0, 1); if ($notice->fetch()) { + if ($notice instanceof ArrayWrapper) { + // hack for things trying to work with single notices + return $notice->_items[0]; + } return $notice; } else { return null; diff --git a/js/util.js b/js/util.js index 4868519228..fce2fd775d 100644 --- a/js/util.js +++ b/js/util.js @@ -575,16 +575,16 @@ var SN = { // StatusNet // Find the threaded replies view we'll be adding to... var list = notice.closest('.notices'); - if (list.hasClass('threaded-notices')) { + if (list.hasClass('threaded-replies')) { // We're replying to a reply; use reply form on the end of this list. // We'll add our form at the end of this; grab the root notice. parentNotice = list.closest('.notice'); } else { // We're replying to a parent notice; pull its threaded list // and we'll add on the end of it. Will add if needed. - list = $('ul.threaded-notices', notice); + list = $('ul.threaded-replies', notice); if (list.length == 0) { - list = $('
'+a+'
'+a+'
'+html+'
'+html+'