diff options
author | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-06-12 20:13:30 +0000 |
---|---|---|
committer | cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-06-12 20:13:30 +0000 |
commit | cf30721c8fa78bd9b2d10a387735c0080021b3c5 (patch) | |
tree | 0922b7d04168767ff3c449b87b642e0ba3adf505 /engine/lib | |
parent | 282969c0901fa0a8644cc5c59fe19c6500178d29 (diff) | |
download | elgg-cf30721c8fa78bd9b2d10a387735c0080021b3c5.tar.gz elgg-cf30721c8fa78bd9b2d10a387735c0080021b3c5.tar.bz2 |
Fixes #3480 not requiring a timestamp when using the js/css page handler
git-svn-id: http://code.elgg.org/elgg/trunk@9191 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib')
-rw-r--r-- | engine/lib/elgglib.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index 08f3d5e7c..df78515f2 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1789,8 +1789,9 @@ 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. + // Additionally, the timestamp is optional. $page = implode('/', $page); - $regex = '|(.+)\.([^\.]+)\.([^.]+)$|'; + $regex = '|(.+?)\.([\d]+\.)?\w+$|'; preg_match($regex, $page, $matches); $view = $matches[1]; $return = elgg_view("$type/$view"); |