summaryrefslogtreecommitdiff
path: root/lib/galleryaction.php
diff options
context:
space:
mode:
authorRobin Millette <millette@plantard.controlezvous.ca>2009-01-23 01:01:01 +0000
committerRobin Millette <millette@plantard.controlezvous.ca>2009-01-23 01:01:01 +0000
commit8a65c5175c3b734d4c53d6a3c3af51c5a645dff2 (patch)
tree6e85645d2e51d517f88413c119ddc4eed26f633b /lib/galleryaction.php
parent4a4efc3b0a453a0e345f4ec5bd8e970130589ae6 (diff)
parent1132e66f84c188f8267165d99d95d04047b6b23b (diff)
Merge branch 'master' of /var/www/trunk
Diffstat (limited to 'lib/galleryaction.php')
-rw-r--r--lib/galleryaction.php7
1 files changed, 5 insertions, 2 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'));