Make the OpenID settings work with new framework

[quix0rs-gnu-social.git] / actions / shownotice.php

diff --git a/actions/shownotice.php b/actions/shownotice.php
index 2df09cb3fcdad121a9536a57de81799fc90dbc5b..82d4bd27014f25fac5094167681c1413ebc823c9 100644 (file)
--- a/actions/shownotice.php
+++ b/actions/shownotice.php
@@ -37,14 +37,14 @@ class ShownoticeAction extends StreamAction
         $this->notice = Notice::staticGet($id);
 
         if (!$this->notice) {
-            $this->client_error(_('No such notice.'), 404);
+            $this->clientError(_('No such notice.'), 404);
             return false;
         }
 
         $this->profile = $this->notice->getProfile();
 
         if (!$this->profile) {
-            $this->server_error(_('Notice has no profile'), 500);
+            $this->serverError(_('Notice has no profile'), 500);
             return false;
         }
 
@@ -81,10 +81,10 @@ class ShownoticeAction extends StreamAction
                            array($this, 'show_header'), null,
                            array($this, 'show_top'));
 
-        common_element_start('ul', array('id' => 'notices'));
+        $this->elementStart('ul', array('id' => 'notices'));
         $nli = new NoticeListItem($this->notice);
         $nli->show();
-        common_element_end('ul');
+        $this->elementEnd('ul');
 
         common_show_footer();
     }
@@ -99,12 +99,12 @@ class ShownoticeAction extends StreamAction
         }
 
         if ($user->emailmicroid && $user->email && $this->notice->uri) {
-            common_element('meta', array('name' => 'microid',
+            $this->element('meta', array('name' => 'microid',
                                          'content' => "mailto+http:sha1:" . sha1(sha1('mailto:' . $user->email) . sha1($this->notice->uri))));
         }
 
         if ($user->jabbermicroid && $user->jabber && $this->notice->uri) {
-            common_element('meta', array('name' => 'microid',
+            $this->element('meta', array('name' => 'microid',
                                          'content' => "xmpp+http:sha1:" . sha1(sha1('xmpp:' . $user->jabber) . sha1($this->notice->uri))));
         }
     }
@@ -119,6 +119,6 @@ class ShownoticeAction extends StreamAction
 
     function no_such_notice()
     {
-        common_user_error(_('No such notice.'));
+        $this->clientError(_('No such notice.'));
     }
 }