Merge branch '0.8.x' into userdesign

Conflicts:

	actions/showfavorites.php
	lib/action.php

1 files changed, 1 insertions, 1 deletions

diff --git a/actions/conversation.php b/actions/conversation.php
index 0d7cb9a87..20c68986c 100644
--- a/actions/conversation.php
+++ b/actions/conversation.php
@@ -207,7 +207,7 @@ class ConversationTree extends NoticeList
         // We take responsibility for doing the li
 
         $this->out->elementStart('li', array('class' => 'hentry notice',
-                                             'id' => 'notice-' . $this->notice->id));
+                                             'id' => 'notice-' . $id));
 
         $item = $this->newListItem($notice);
         $item->show();