aboutsummaryrefslogtreecommitdiff
path: root/views/default/navigation
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-02-11 21:14:18 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-02-11 21:14:18 +0000
commitde0149375cdb6f6667adfe3f83b0f99d8c94b855 (patch)
tree190ffee7b2a7721e15808d25e6e46e1ebac1caa9 /views/default/navigation
parent8316e001b76173f26fab27a7c72ba039e0128293 (diff)
downloadelgg-de0149375cdb6f6667adfe3f83b0f99d8c94b855.tar.gz
elgg-de0149375cdb6f6667adfe3f83b0f99d8c94b855.tar.bz2
Fixes #1507: $vars['baseurl'] used instead of undefined $baseurl in pagination view.
git-svn-id: http://code.elgg.org/elgg/trunk@3931 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views/default/navigation')
-rw-r--r--views/default/navigation/pagination.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/views/default/navigation/pagination.php b/views/default/navigation/pagination.php
index 0512aada1..11dfd0e86 100644
--- a/views/default/navigation/pagination.php
+++ b/views/default/navigation/pagination.php
@@ -38,8 +38,6 @@ if (isset($vars['nonefound'])) {
$totalpages = ceil($count / $limit);
$currentpage = ceil($offset / $limit) + 1;
-//$baseurl = elgg_http_remove_url_query_element($vars['baseurl'], $word);
-
//only display if there is content to paginate through or if we already have an offset
if (($count > $limit || $offset > 0) && get_context() != 'widget') {
@@ -55,7 +53,7 @@ if (($count > $limit || $offset > 0) && get_context() != 'widget') {
$prevoffset = 0;
}
- $prevurl = elgg_http_add_url_query_elements($baseurl, array($word => $prevoffset));
+ $prevurl = elgg_http_add_url_query_elements($vars['baseurl'], array($word => $prevoffset));
echo "<a href=\"{$prevurl}\" class=\"pagination_previous\">&laquo; ". elgg_echo("previous") ."</a> ";
}
@@ -95,7 +93,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($vars['baseurl'], array($word => $curoffset));
if ($curoffset != $offset) {
echo " <a href=\"{$counturl}\" class=\"pagination_number\">{$i}</a> ";
@@ -114,7 +112,7 @@ if (($count > $limit || $offset > 0) && get_context() != 'widget') {
$nextoffset--;
}
- $nexturl = elgg_http_add_url_query_elements($baseurl, array($word => $nextoffset));
+ $nexturl = elgg_http_add_url_query_elements($vars['baseurl'], array($word => $nextoffset));
echo " <a href=\"{$nexturl}\" class=\"pagination_next\">" . elgg_echo("next") . " &raquo;</a>";