diff options
| author | Sem <sembrestels@riseup.net> | 2011-12-31 20:14:45 +0100 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2011-12-31 20:14:45 +0100 |
| commit | 9f4da6d87f2c520b975f968cedbcde4f3dce1a25 (patch) | |
| tree | fee953cf498b6083faf56c61042d3bee07110331 /engine/classes/ElggSite.php | |
| parent | a22660e997611fe2afb97689ea23774578ee80db (diff) | |
| parent | e49df853b2cc3a6a9bc2dd527a64951050142eb9 (diff) | |
| download | elgg-9f4da6d87f2c520b975f968cedbcde4f3dce1a25.tar.gz elgg-9f4da6d87f2c520b975f968cedbcde4f3dce1a25.tar.bz2 | |
Merge git://github.com/Elgg/Elgg
Diffstat (limited to 'engine/classes/ElggSite.php')
| -rw-r--r-- | engine/classes/ElggSite.php | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php index 16b80b9d3..2d6238a19 100644 --- a/engine/classes/ElggSite.php +++ b/engine/classes/ElggSite.php @@ -128,7 +128,7 @@ class ElggSite extends ElggEntity { $row = get_site_entity_as_row($guid); if (($row) && (!$this->isFullyLoaded())) { // If $row isn't a cached copy then increment the counter - $this->attributes['tables_loaded'] ++; + $this->attributes['tables_loaded']++; } // Now put these into the attributes array as core values @@ -137,6 +137,9 @@ class ElggSite extends ElggEntity { $this->attributes[$key] = $value; } + // guid needs to be an int http://trac.elgg.org/ticket/4111 + $this->attributes['guid'] = (int)$this->attributes['guid']; + return true; } @@ -418,10 +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 |