GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

make tags in list work

Browse Source
This commit is contained in:
Evan Prodromou 2009-04-07 11:40:13 -04:00
parent f09886672b
commit 4cc6d0ea2c
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/action.php
View File

@ -921,11 +921,15 @@ class Action extends HTMLOutputter // lawsuit
* *
* @return string current URL * @return string current URL
*/ */
function selfUrl() function selfUrl()
{ {
$action = $this->trimmed('action'); $action = $this->trimmed('action');
$args = $this->args; $args = $this->args;
unset($args['action']); unset($args['action']);
if (array_key_exists('submit', $args)) {
unset($args['submit']);
}
foreach (array_keys($_COOKIE) as $cookie) { foreach (array_keys($_COOKIE) as $cookie) {
unset($args[$cookie]); unset($args[$cookie]);
} }

7
lib/galleryaction.php
View File

@ -50,7 +50,7 @@ class GalleryAction extends Action
if ($this->arg('page') && $this->arg('page') != 1) { if ($this->arg('page') && $this->arg('page') != 1) {
$args['page'] = $this->arg['page']; $args['page'] = $this->arg['page'];
} }
common_redirect(common_local_url('subscriptions', $args), 301); common_redirect(common_local_url($this->trimmed('action'), $args), 301);
return false; return false;
} }
@ -71,6 +71,7 @@ class GalleryAction extends Action
$this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1; $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
$this->tag = $this->trimmed('tag'); $this->tag = $this->trimmed('tag');
$this->q = $this->trimmed('q');
return true; return true;
} }
@ -87,7 +88,7 @@ class GalleryAction extends Action
# Post from the tag dropdown; redirect to a GET # Post from the tag dropdown; redirect to a GET
if ($_SERVER['REQUEST_METHOD'] == 'POST') { if ($_SERVER['REQUEST_METHOD'] == 'POST') {
common_redirect($this->selfUrl(), 307); common_redirect($this->selfUrl(), 303);
return; return;
} }
@ -136,7 +137,7 @@ class GalleryAction extends Action
'method' => 'post')); 'method' => 'post'));
$this->dropdown('tag', _('Tag'), $content, $this->dropdown('tag', _('Tag'), $content,
_('Choose a tag to narrow list'), false, $tag); _('Choose a tag to narrow list'), false, $tag);
$this->submit('go', _('Go')); $this->submit('submit', _('Go'));
$this->elementEnd('form'); $this->elementEnd('form');
$this->elementEnd('li'); $this->elementEnd('li');
$this->elementEnd('ul'); $this->elementEnd('ul');