aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-01 18:47:41 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-06-01 18:47:41 +0000
commitc13882f685cbad429f323808427207c4dbdef826 (patch)
tree4ddeaa83e981ca1685dd137211111d05def57b50 /views
parent4e3462c86b6dba589d787c0967c523e4fc49c33e (diff)
downloadelgg-c13882f685cbad429f323808427207c4dbdef826.tar.gz
elgg-c13882f685cbad429f323808427207c4dbdef826.tar.bz2
Fixed bug in detecting and using baseurl in navingation/pagination view.
git-svn-id: http://code.elgg.org/elgg/trunk@6311 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/navigation/pagination.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index 9dde51eea..e20891070 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -38,7 +38,7 @@ if (isset($vars['nonefound'])) {
$totalpages = ceil($count / $limit);
$currentpage = ceil($offset / $limit) + 1;
-//$baseurl = elgg_http_remove_url_query_element($vars['baseurl'], $word);
+$baseurl = isset($vars['baseurl']) ? $vars['baseurl'] : current_page_url();
//only display if there is content to paginate through or if we already have an offset
if (($count > $limit || $offset > 0) && get_context() != 'widget') {
@@ -95,7 +95,7 @@ if (($count > $limit || $offset > 0) && get_context() != 'widget') {
}
$curoffset = (($i - 1) * $limit);
- $counturl = elgg_http_add_url_query_elements($base_url, array($word => $curoffset));
+ $counturl = elgg_http_add_url_query_elements($baseurl, array($word => $curoffset));
if ($curoffset != $offset) {
echo " <a href=\"{$counturl}\" class='pagination_number'>{$i}</a> ";