1 files changed, 12 insertions, 0 deletions

diff --git a/lib/stream.php b/lib/stream.php
index fefd77a46..490a2739b 100644
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -27,6 +27,7 @@ class StreamAction extends Action {
 
 	function handle($args) {
 		parent::handle($args);
+                common_set_returnto($this->self_url());
 	}
 
 	function views_menu() {
@@ -62,6 +63,11 @@ class StreamAction extends Action {
 	function show_notice($notice) {
 		global $config;
 		$profile = $notice->getProfile();
+                if (common_logged_in()) {
+                    $user = common_current_user();
+                    $user_profile = $user->getProfile();
+                }
+
 		# XXX: RDFa
 		common_element_start('li', array('class' => 'notice_single',
 										  'id' => 'notice-' . $notice->id));
@@ -112,6 +118,12 @@ class StreamAction extends Action {
 		common_raw('→');
 		common_element_end('a');
 		common_element_end('p');
+                if ($notice->profile_id == $user_profile->id) {
+                        $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
+                        common_element('a', array('class' => 'deletenotice',
+                                                                            'href' => $deleteurl),
+                                                    _('delete'));
+                }
 		common_element_end('li');
 	}
 }