From a482123feaf4ce90d24326067b4e75445b3dfeaa Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Thu, 11 Sep 2008 10:47:42 -0400 Subject: reverse order of queries for galleries darcs-hash:20080911144742-84dde-235a1af2d958500b1f1c503f21785284ca4b5c8a.gz --- lib/gallery.php | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/gallery.php b/lib/gallery.php index a79cde7b8..a478db25d 100644 --- a/lib/gallery.php +++ b/lib/gallery.php @@ -31,17 +31,22 @@ class GalleryAction extends Action { function handle($args) { parent::handle($args); - $nickname = $this->arg('nickname'); - $profile = Profile::staticGet('nickname', $nickname); - if (!$profile) { + $nickname = common_canonical_nickname($this->arg('nickname')); + + $user = User::staticGet('nickname', $nickname); + + if (!$user) { $this->no_such_user(); return; } - $user = User::staticGet($profile->id); - if (!$user) { - $this->no_such_user(); + + $profile = $user->getProfile(); + + if (!$profile) { + $this->server_error(_('User without matching profile in system.')); return; } + $page = $this->arg('page'); if (!$page) { $page = 1; @@ -99,7 +104,7 @@ class GalleryAction extends Action { common_log(LOG_WARNING, 'No matching profile for ' . $other_id); continue; } - + common_element_start('li'); common_element_start('a', array('title' => ($other->fullname) ? -- cgit v1.2.3-54-g00ecf