diff options
| author | friendica <info@friendica.com> | 2015-01-08 19:13:32 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-08 19:13:32 -0800 |
| commit | 623a5b7c6c748fa30c37678f1443f2ab5f71ccc6 (patch) | |
| tree | fe2da9bdca7e3366919e1757b2e196885b82e2a1 /include/dir_fns.php | |
| parent | 1159ffaf7ad29ce79716ada811f4c69e5db36c9d (diff) | |
| parent | af943f45692a37c570ca4a4ef450f897b3065a90 (diff) | |
| download | volse-hubzilla-623a5b7c6c748fa30c37678f1443f2ab5f71ccc6.tar.gz volse-hubzilla-623a5b7c6c748fa30c37678f1443f2ab5f71ccc6.tar.bz2 volse-hubzilla-623a5b7c6c748fa30c37678f1443f2ab5f71ccc6.zip | |
Merge branch 'master' into trinidad
Diffstat (limited to 'include/dir_fns.php')
| -rw-r--r-- | include/dir_fns.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php index 98b906e84..0cbe2daec 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -56,12 +56,15 @@ function dir_sort_links() { $current_order = (($_REQUEST['order']) ? $_REQUEST['order'] : 'normal'); $url = 'directory?'; + $tmp = array_merge($_GET,$_POST); unset($tmp['order']); + unset($tmp['q']); $sorturl = $url . http_build_query($tmp); - $tmp = array_merge($_GET,$_POST); + $tmp = array_merge($_GET,$_POST); unset($tmp['pubforums']); + unset($tmp['q']); $forumsurl = $url . http_build_query($tmp); $o = replace_macros(get_markup_template('dir_sort_links.tpl'), array( |