Comment improvements with spl_autoload_register

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

diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index ac2feeeccf11d5bcfc8fc253c4b33dfbf520c91b..975933f6cceeb492c393f985d0d64594b1663b29 100644 (file)
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -28,7 +28,7 @@ require_once INSTALLDIR.'/lib/profilelist.php';
 define('AVATARS_PER_PAGE', 80);
 
 // @todo FIXME: Class documentation missing.
-class GalleryAction extends OwnerDesignAction
+class GalleryAction extends ProfileAction
 {
     var $profile = null;
     var $page = null;
@@ -51,23 +51,20 @@ class GalleryAction extends OwnerDesignAction
                 $args['page'] = $this->arg['page'];
             }
             common_redirect(common_local_url($this->trimmed('action'), $args), 301);
-            return false;
         }
 
-        $this->user = User::staticGet('nickname', $nickname);
+        $this->user = User::getKV('nickname', $nickname);
 
         if (!$this->user) {
             // TRANS: Client error displayed when trying to perform a gallery action with an unknown user.
             $this->clientError(_('No such user.'), 404);
-            return false;
         }
 
         $this->profile = $this->user->getProfile();
 
         if (!$this->profile) {
-            // TRANS: Server error displayed when trying to perform a gallery action with a user without a profile.
+            // TRANS: Error message displayed when referring to a user without a profile.
             $this->serverError(_('User has no profile.'));
-            return false;
         }
 
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
@@ -91,18 +88,11 @@ class GalleryAction extends OwnerDesignAction
 
                if ($_SERVER['REQUEST_METHOD'] == 'POST') {
                    common_redirect($this->selfUrl(), 303);
-            return;
                }
 
         $this->showPage();
     }
 
-    function showObjectNav()
-    {
-        $nav = new SubGroupNav($this, $this->user);
-        $nav->show();
-    }
-
     function showContent()
     {
         $this->showTagsDropdown();