From 5571ca5b350fd1735f13af7ddfbb88afa6befb0c Mon Sep 17 00:00:00 2001
From: brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Mon, 5 Apr 2010 15:11:05 +0000
Subject: Merged 5487:5525 from 1.7 to trunk.

git-svn-id: http://code.elgg.org/elgg/trunk@5621 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 mod/embed/views/default/embed/media.php      | 2 +-
 mod/embed/views/default/embed/pagination.php | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'mod/embed/views/default')

diff --git a/mod/embed/views/default/embed/media.php b/mod/embed/views/default/embed/media.php
index 25e63ce7d..ff0505466 100644
--- a/mod/embed/views/default/embed/media.php
+++ b/mod/embed/views/default/embed/media.php
@@ -7,7 +7,7 @@
 <?php
 	echo elgg_view('embed/pagination',array(
 												'offset' => $vars['offset'],
-												'baseurl' => $vars['url'] . 'pg/embed/media?internalname=' . $vars['internalname'] . "&amp;simpletype=" . $vars['simpletype'],
+												'baseurl' => $vars['url'] . 'pg/embed/media?internalname=' . $vars['internalname'] . "&simpletype=" . $vars['simpletype'],
 												'limit' => $vars['limit'],
 												'count' => $vars['count']
 											));
diff --git a/mod/embed/views/default/embed/pagination.php b/mod/embed/views/default/embed/pagination.php
index b5a741fcd..ded9f21e1 100644
--- a/mod/embed/views/default/embed/pagination.php
+++ b/mod/embed/views/default/embed/pagination.php
@@ -38,6 +38,8 @@
 		$nonefound = true;
 	}
 
+	$baseurl = $vars['baseurl'];
+
 	$totalpages = ceil($count / $limit);
 	$currentpage = ceil($offset / $limit) + 1;
 
@@ -97,7 +99,7 @@
 			}
 
 			$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 onclick=\"javascript:$('.popup .content').load('{$counturl}'); return false\" href=\"#\" class=\"pagination_number\">{$i}</a> ";
-- 
cgit v1.2.3