X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=plugins%2FEvent%2Fshowevent.php;h=f1d8c6a0ddcc8bf9762b53cb5f60d10cfdc5c050;hb=b6cfcfbcaa0459b39c5d581c103bfa031b2e02cd;hp=7fb702f9dbeea5a80dec9d4584fb3f5c8ab2426b;hpb=c6f9baf78cce7ca2e2e5d2f6c4752209e0a74616;p=quix0rs-gnu-social.git

diff --git a/plugins/Event/showevent.php b/plugins/Event/showevent.php
index 7fb702f9db..f1d8c6a0dd 100644
--- a/plugins/Event/showevent.php
+++ b/plugins/Event/showevent.php
@@ -4,7 +4,7 @@
  * Copyright (C) 2011, StatusNet, Inc.
  *
  * Show a single event
- * 
+ *
  * PHP version 5
  *
  * This program is free software: you can redistribute it and/or modify
@@ -44,54 +44,31 @@ if (!defined('STATUSNET')) {
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
  * @link      http://status.net/
  */
-
 class ShoweventAction extends ShownoticeAction
 {
     protected $id    = null;
     protected $event = null;
 
-    /**
-     * For initializing members of the class.
-     *
-     * @param array $argarray misc. arguments
-     *
-     * @return boolean true
-     */
-
-    function prepare($argarray)
+    function getNotice()
     {
-        OwnerDesignAction::prepare($argarray);
-
         $this->id = $this->trimmed('id');
 
-        $this->event = Happening::staticGet('id', $this->id);
+        $this->event = Happening::getKV('id', $this->id);
 
         if (empty($this->event)) {
-            throw new ClientException(_('No such event.'), 404);
+            // TRANS: Client exception thrown when referring to a non-existing event.
+            throw new ClientException(_m('No such event.'), 404);
         }
 
-        $this->notice = $this->event->getNotice();
+        $notice = $this->event->getNotice();
 
-        if (empty($this->notice)) {
+        if (empty($notice)) {
             // Did we used to have it, and it got deleted?
-            throw new ClientException(_('No such event.'), 404);
+            // TRANS: Client exception thrown when referring to a non-existing event.
+            throw new ClientException(_m('No such event.'), 404);
         }
 
-        $this->user = User::staticGet('id', $this->event->profile_id);
-
-        if (empty($this->user)) {
-            throw new ClientException(_('No such user.'), 404);
-        }
-
-        $this->profile = $this->user->getProfile();
-
-        if (empty($this->profile)) {
-            throw new ServerException(_('User without a profile.'));
-        }
-
-        $this->avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
-
-        return true;
+        return $notice;
     }
 
     /**
@@ -101,7 +78,6 @@ class ShoweventAction extends ShownoticeAction
      *
      * @return string page tile
      */
-
     function title()
     {
         return $this->event->title;