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

diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php
index 08f3d5e7cad594ec0dd1ee3afe73dd4823cdc09d..df78515f24c278ef7e3b52ca04f0b72c814110f9 100644 (file)
--- 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");