diff options
| author | Sem <sembrestels@riseup.net> | 2012-10-19 09:47:11 +0200 |
|---|---|---|
| committer | Sem <sembrestels@riseup.net> | 2012-10-19 09:47:11 +0200 |
| commit | 80ca3d447737a679f773cbea7e788ee190abea69 (patch) | |
| tree | 62bd6ec58b5fc8ad02bd529d187591659dc39b65 /engine/lib/sites.php | |
| parent | 9a4ed2014e9880130c1bbc52bb980e44a488bad9 (diff) | |
| parent | d134beadb79fcc90a75bda8bbcbfb9987b27470c (diff) | |
| download | elgg-80ca3d447737a679f773cbea7e788ee190abea69.tar.gz elgg-80ca3d447737a679f773cbea7e788ee190abea69.tar.bz2 | |
Merge branch '1.8' of git://github.com/Elgg/Elgg into lorea-preprod
Diffstat (limited to 'engine/lib/sites.php')
| -rw-r--r-- | engine/lib/sites.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/engine/lib/sites.php b/engine/lib/sites.php index 850092cad..8b772668d 100644 --- a/engine/lib/sites.php +++ b/engine/lib/sites.php @@ -18,11 +18,19 @@ function elgg_get_site_entity($site_guid = 0) { global $CONFIG; + $result = false; + if ($site_guid == 0) { - return $CONFIG->site; + $site = $CONFIG->site; + } else { + $site = get_entity($site_guid); + } + + if($site instanceof ElggSite){ + $result = $site; } - return get_entity($site_guid); + return $result; } /** |