diff options
| author | Cash Costello <cash.costello@gmail.com> | 2011-12-22 08:12:07 -0500 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2011-12-22 08:12:07 -0500 |
| commit | e49df853b2cc3a6a9bc2dd527a64951050142eb9 (patch) | |
| tree | 6f485b560f89331c65fad3993e055a1834b07177 /engine/classes/ElggSite.php | |
| parent | 5e5b3705a5ca7b66dfe386490c5570af88b49009 (diff) | |
| parent | fea599f1653d7206e34ac33c0c0a668cb587bc20 (diff) | |
| download | elgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.gz elgg-e49df853b2cc3a6a9bc2dd527a64951050142eb9.tar.bz2 | |
Merge branch '1.8' after 1.8.2 release
Conflicts:
version.php
Diffstat (limited to 'engine/classes/ElggSite.php')
| -rw-r--r-- | engine/classes/ElggSite.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php index 0d03cbd28..2d6238a19 100644 --- a/engine/classes/ElggSite.php +++ b/engine/classes/ElggSite.php @@ -422,7 +422,9 @@ class ElggSite extends ElggEntity { 'ajax/view/js/languages', 'upgrade\.php', 'css/.*', - 'js/.*' + 'js/.*', + 'cache/css/.*', + 'cache/js/.*', ); // include a hook for plugin authors to include public pages |