diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2008-11-23 23:59:24 -0500 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2008-11-23 23:59:24 -0500 |
| commit | 8d7af455cf69476915ba5d780bc279a117f3fca8 (patch) | |
| tree | 3cef00978aff65fd383de3e9eea3e3c058b160e1 /lib | |
| parent | 45dfacd2aef773ed90eed4ff4c936556cb806d55 (diff) | |
retain links in List and Icon switch
darcs-hash:20081124045924-5ed1f-2a8c374362334914fe37aad1fc8be2a661d54675.gz
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gallery.php | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/lib/gallery.php b/lib/gallery.php index 024649e28..6483b4722 100644 --- a/lib/gallery.php +++ b/lib/gallery.php @@ -228,6 +228,8 @@ class GalleryAction extends Action { } function display_links($profile, $page, $display) { + $tag = $this->trimmed('tag'); + common_element_start('dl', array('id'=>'subscriptions_nav')); common_element('dt', null, _('Subscriptions navigation')); common_element_start('dd'); @@ -237,18 +239,26 @@ class GalleryAction extends Action { case 'list': common_element('li', array('class'=>'child_1'), _('List')); common_element_start('li'); - common_element('a', array('href' => common_local_url($this->trimmed('action'), - array('display' => 'icons', - 'nickname' => $profile->nickname, - 'page' => 1 + floor((($page - 1) * PROFILES_PER_PAGE) / AVATARS_PER_PAGE)))), + $url_args = array('display' => 'icons', + 'nickname' => $profile->nickname, + 'page' => 1 + floor((($page - 1) * PROFILES_PER_PAGE) / AVATARS_PER_PAGE)); + if ($tag) { + $url_args['tag'] = $tag; + } + $url = common_local_url($this->trimmed('action'), $url_args); + common_element('a', array('href' => $url), _('Icons')); common_element_end('li'); break; default: - common_element_start('li', array('class'=>'child_1')); - common_element('a', array('href' => common_local_url($this->trimmed('action'), - array('nickname' => $profile->nickname, - 'page' => 1 + floor((($page - 1) * AVATARS_PER_PAGE) / PROFILES_PER_PAGE)))), + common_element_start('li', array('class'=>'child_1')); + $url_args = array('nickname' => $profile->nickname, + 'page' => 1 + floor((($page - 1) * AVATARS_PER_PAGE) / PROFILES_PER_PAGE)); + if ($tag) { + $url_args['tag'] = $tag; + } + common_local_url($this->trimmed('action'), $url_args); + common_element('a', array('href' => $url), _('List')); common_element_end('li'); common_element('li', NULL, _('Icons')); |