aboutsummaryrefslogtreecommitdiff
path: root/engine/lib
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-13 19:30:44 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-04-13 19:30:44 +0000
commitd87b6ffe7312888d109428e6a939f33394549677 (patch)
treed9211c16c9ac3bb646b0049cc54eda56a11af81c /engine/lib
parent388d8405bb10b3b2107629f8cd4133bff3a7693c (diff)
downloadelgg-d87b6ffe7312888d109428e6a939f33394549677.tar.gz
elgg-d87b6ffe7312888d109428e6a939f33394549677.tar.bz2
Fixes #3331. Changed cache schema to allow for JS/CSS views with slashes and dots.
git-svn-id: http://code.elgg.org/elgg/trunk@8986 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
-rw-r--r--engine/lib/cache.php2
-rw-r--r--engine/lib/elgglib.php10
2 files changed, 5 insertions, 7 deletions
diff --git a/engine/lib/cache.php b/engine/lib/cache.php
index d4888f9d9..8529ae7fa 100644
--- a/engine/lib/cache.php
+++ b/engine/lib/cache.php
@@ -166,7 +166,7 @@ function elgg_get_simplecache_url($type, $view) {
if (elgg_is_simplecache_enabled()) {
$viewtype = elgg_get_viewtype();
- $url = elgg_get_site_url() . "cache/$type/$view/$viewtype/$view.$lastcache.$type";
+ $url = elgg_get_site_url() . "cache/$type/$viewtype/$view.$lastcache.$type";
} else {
$url = elgg_get_site_url() . "$type/$view.$lastcache.$type";
}
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 063e25fc4..a800aca7a 100644
--- a/engine/lib/elgglib.php
+++ b/engine/lib/elgglib.php
@@ -1771,12 +1771,10 @@ function elgg_cacheable_view_page_handler($page, $type) {
// translates to the url /js/calendars/jquery.fullcalendar.min.<ts>.js
// and the view js/calendars/jquery.fullcalendar.min
// we ignore the last two dots for the ts and the ext.
- $last_part = array_pop($page);
- $last_part_bits = explode('.', $last_part);
- $last_part_bits = array_slice($last_part_bits, 0, -2);
- $page[] = implode('.', $last_part_bits);
-
- $view = implode('/', $page);
+ $page = implode('/', $page);
+ $regex = '|(.+)\.([^\.]+)\.([^.]+)$|';
+ preg_match($regex, $page, $matches);
+ $view = $matches[1];
$return = elgg_view("$type/$view");
header("Content-type: $content_type");