aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-08 19:21:27 -0800
committerfriendica <info@friendica.com>2015-01-08 19:21:27 -0800
commit072dc6e820e9f6f1a561e62e4873187bf25f19e8 (patch)
treece8dd0fb7a5c998f87925dd8cfbc3e115bca54c4
parent623a5b7c6c748fa30c37678f1443f2ab5f71ccc6 (diff)
parent1b535ff8a5762604ae96d0ad00488738090c083b (diff)
downloadvolse-hubzilla-072dc6e820e9f6f1a561e62e4873187bf25f19e8.tar.gz
volse-hubzilla-072dc6e820e9f6f1a561e62e4873187bf25f19e8.tar.bz2
volse-hubzilla-072dc6e820e9f6f1a561e62e4873187bf25f19e8.zip
Merge branch 'master' into trinidad
-rw-r--r--include/dir_fns.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php
index 0cbe2daec..371ee0fbc 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -55,16 +55,18 @@ function dir_sort_links() {
// Probably there's an easier way to do this
$current_order = (($_REQUEST['order']) ? $_REQUEST['order'] : 'normal');
- $url = 'directory?';
+ $url = 'directory?f=';
$tmp = array_merge($_GET,$_POST);
unset($tmp['order']);
unset($tmp['q']);
+ unset($tmp['f']);
$sorturl = $url . http_build_query($tmp);
$tmp = array_merge($_GET,$_POST);
unset($tmp['pubforums']);
unset($tmp['q']);
+ unset($tmp['f']);
$forumsurl = $url . http_build_query($tmp);
$o = replace_macros(get_markup_template('dir_sort_links.tpl'), array(