auto-load OAuthRequest

[quix0rs-gnu-social.git] / lib / stream.php

diff --git a/lib/stream.php b/lib/stream.php
index 4dbb99093ef93459a0a414d905b8a728eb57aad8..64dbcbce3665da592b6a555e98a6de3a40d3821c 100644 (file)
--- a/lib/stream.php
+++ b/lib/stream.php
@@ -66,12 +66,7 @@ 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();
-               } else {
-                       $user_profile = false;
-               }
+               $user = common_current_user();
 
                # XXX: RDFa
                common_element_start('li', array('class' => 'notice_single',
@@ -126,13 +121,15 @@ class StreamAction extends Action {
                                                                   'class' => 'replybutton'));
                common_raw('→');
                common_element_end('a');
-               common_element_end('p');
-               if ($user_profile && $notice->profile_id == $user_profile->id) {
+               if ($user && $notice->profile_id == $user->id) {
                        $deleteurl = common_local_url('deletenotice', array('notice' => $notice->id));
-                       common_element('a', array('class' => 'deletenotice',
-                                                                        'href' => $deleteurl),
-                                                  _('delete'));
+                       common_element_start('a', array('class' => 'deletenotice',
+                                                                                       'href' => $deleteurl,
+                                                                                       'title' => _('delete')));
+                       common_raw('×');
+                       common_element_end('a');
                }
+               common_element_end('p');
                common_element_end('li');
        }
        
@@ -147,7 +144,7 @@ class StreamAction extends Action {
                        common_element('span', 'noticesource', $source_name);
                        break;
                 default:
-                       $ns = new Notice_source($source);
+                       $ns = Notice_source::staticGet($source);
                        if ($ns) {
                                common_element('a', array('href' => $ns->url),
                                                           $ns->name);