From: Cash Costello <cash.costello@gmail.com>
Date: Thu, 22 Dec 2011 13:12:07 +0000 (-0500)
Subject: Merge branch '1.8' after 1.8.2 release
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e49df853b2cc3a6a9bc2dd527a64951050142eb9;p=lorea%2Felgg.git

Merge branch '1.8' after 1.8.2 release

Conflicts:
	version.php
---

e49df853b2cc3a6a9bc2dd527a64951050142eb9
diff --cc engine/classes/ElggSite.php
index 0d03cbd28,3ccb146fb..2d6238a19
--- a/engine/classes/ElggSite.php
+++ b/engine/classes/ElggSite.php
@@@ -421,8 -421,12 +421,10 @@@ class ElggSite extends ElggEntity 
  			'action/security/refreshtoken',
  			'ajax/view/js/languages',
  			'upgrade\.php',
 -			'xml-rpc\.php',
 -			'mt/mt-xmlrpc\.cgi',
  			'css/.*',
- 			'js/.*'
+ 			'js/.*',
+ 			'cache/css/.*',
+ 			'cache/js/.*',
  		);
  
  		// include a hook for plugin authors to include public pages