diff options
| author | friendica <info@friendica.com> | 2015-01-08 19:10:39 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-08 19:10:39 -0800 |
| commit | 1159ffaf7ad29ce79716ada811f4c69e5db36c9d (patch) | |
| tree | 22918bfa97a7230b1ee7c682aa5b0c032b9ff694 | |
| parent | fab09ef1bc7ebd74055f62350e7012dec09c817b (diff) | |
| parent | 1e4e7ce2d3c28331d408ad0e40ab0e3bb912e7f1 (diff) | |
| download | volse-hubzilla-1159ffaf7ad29ce79716ada811f4c69e5db36c9d.tar.gz volse-hubzilla-1159ffaf7ad29ce79716ada811f4c69e5db36c9d.tar.bz2 volse-hubzilla-1159ffaf7ad29ce79716ada811f4c69e5db36c9d.zip | |
Merge branch 'master' into trinidad
| -rw-r--r-- | include/dir_fns.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/dir_fns.php b/include/dir_fns.php index af6f78c01..98b906e84 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -56,10 +56,10 @@ function dir_sort_links() { $current_order = (($_REQUEST['order']) ? $_REQUEST['order'] : 'normal'); $url = 'directory?'; - $tmp = $_REQUEST; + $tmp = array_merge($_GET,$_POST); unset($tmp['order']); $sorturl = $url . http_build_query($tmp); - $tmp = $_REQUEST; + $tmp = array_merge($_GET,$_POST); unset($tmp['pubforums']); $forumsurl = $url . http_build_query($tmp); |