aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-18 18:15:14 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-18 18:15:14 +0000
commite18e17ef647e7faf4563bb8ce77ffe448bc929cb (patch)
tree17dd9d11c890a4ac8f0ca7a2ae41c0f3a25a79de /engine
parent6729a2d0d2faeb07ca8e79b5162c3be269e01b66 (diff)
downloadelgg-e18e17ef647e7faf4563bb8ce77ffe448bc929cb.tar.gz
elgg-e18e17ef647e7faf4563bb8ce77ffe448bc929cb.tar.bz2
Fixes #3365. Pulled in blacktooth's patch.
git-svn-id: http://code.elgg.org/elgg/trunk@9003 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/cache.php6
1 files changed, 4 insertions, 2 deletions
diff --git a/engine/lib/cache.php b/engine/lib/cache.php
index 8529ae7fa..11c95e78a 100644
--- a/engine/lib/cache.php
+++ b/engine/lib/cache.php
@@ -163,13 +163,15 @@ function elgg_register_simplecache_view($viewname) {
function elgg_get_simplecache_url($type, $view) {
global $CONFIG;
$lastcache = (int)$CONFIG->lastcache;
-
+ $viewtype = elgg_get_viewtype();
if (elgg_is_simplecache_enabled()) {
- $viewtype = elgg_get_viewtype();
$url = elgg_get_site_url() . "cache/$type/$viewtype/$view.$lastcache.$type";
} else {
$url = elgg_get_site_url() . "$type/$view.$lastcache.$type";
+ $elements = array("view" => $viewtype);
+ $url = elgg_http_add_url_query_elements($url, $elements);
}
+
return $url;
}