diff options
| author | Evan Prodromou <evan@controlyourself.ca> | 2009-01-22 22:38:10 +0000 |
|---|---|---|
| committer | Evan Prodromou <evan@controlyourself.ca> | 2009-01-22 22:38:10 +0000 |
| commit | d6879bfe0c188b06f7b7730bb64af469d5c6e461 (patch) | |
| tree | 3c85fbb8093001d5272a04cb4d1bf7c1751d061b /lib | |
| parent | 04d498784ff1892607a3aee65d76104192fe4af2 (diff) | |
Debug some of the subscriptions+tags problems
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/galleryaction.php | 7 | ||||
| -rw-r--r-- | lib/profilelist.php | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/galleryaction.php b/lib/galleryaction.php index a277762a6..25a5e3fd5 100644 --- a/lib/galleryaction.php +++ b/lib/galleryaction.php @@ -32,6 +32,7 @@ class GalleryAction extends Action var $profile = null; var $user = null; var $page = null; + var $tag = null; function prepare($args) { @@ -69,6 +70,8 @@ class GalleryAction extends Action $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; + $this->tag = $this->trimmed('tag'); + return true; } @@ -84,7 +87,7 @@ class GalleryAction extends Action # Post from the tag dropdown; redirect to a GET if ($_SERVER['REQUEST_METHOD'] == 'POST') { - common_redirect($this->self_url(), 307); + common_redirect($this->selfUrl(), 307); return; } @@ -124,7 +127,7 @@ class GalleryAction extends Action array('href' => common_local_url($this->trimmed('action'), array('nickname' => - $profile->nickname))), + $this->user->nickname))), _('All')); $this->elementEnd('li'); $this->elementStart('li', array('id'=>'filter_tags_item')); diff --git a/lib/profilelist.php b/lib/profilelist.php index a510c518c..499d74f7b 100644 --- a/lib/profilelist.php +++ b/lib/profilelist.php @@ -169,9 +169,9 @@ class ProfileList extends Widget $this->out->elementStart('ul', 'tags xoxo'); foreach ($tags as $tag) { $this->out->elementStart('li'); - $this->element('span', 'mark_hash', '#'); + $this->out->element('span', 'mark_hash', '#'); $this->out->element('a', array('rel' => 'tag', - 'href' => common_local_url($this->action, + 'href' => common_local_url($this->action->trimmed('action'), array('nickname' => $this->owner->nickname, 'tag' => $tag))), $tag); |