diff options
| author | Cash Costello <cash.costello@gmail.com> | 2012-01-18 15:55:55 -0800 |
|---|---|---|
| committer | Cash Costello <cash.costello@gmail.com> | 2012-01-18 15:55:55 -0800 |
| commit | b8d9fd50683965259f1836b959c74dc96f10a525 (patch) | |
| tree | 5b465f0f44601f95c5e5d3f8b0a0b012e87758fc | |
| parent | 15511a9ba9311722f4c3c34ca4f404b2061f67dd (diff) | |
| parent | 4475c407da7af8aef22b05d42a47d25019e68093 (diff) | |
| download | elgg-b8d9fd50683965259f1836b959c74dc96f10a525.tar.gz elgg-b8d9fd50683965259f1836b959c74dc96f10a525.tar.bz2 | |
Merge pull request #147 from jeabakker/patch-1
Fixes #4307 using elgg_get_site_entity() to work with multiple sites
| -rw-r--r-- | actions/admin/site/update_advanced.php | 3 | ||||
| -rw-r--r-- | actions/admin/site/update_basic.php | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/actions/admin/site/update_advanced.php b/actions/admin/site/update_advanced.php index 7d57f78ea..12c5542e7 100644 --- a/actions/admin/site/update_advanced.php +++ b/actions/admin/site/update_advanced.php @@ -9,8 +9,7 @@ * @subpackage Administration.Site */ -if (datalist_get('default_site')) { - $site = get_entity(datalist_get('default_site')); +if ($site = elgg_get_site_entity()) { if (!($site instanceof ElggSite)) { throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite')); } diff --git a/actions/admin/site/update_basic.php b/actions/admin/site/update_basic.php index 45f00a20d..97d258b65 100644 --- a/actions/admin/site/update_basic.php +++ b/actions/admin/site/update_basic.php @@ -10,8 +10,7 @@ * @subpackage Administration.Site */ -if (datalist_get('default_site')) { - $site = get_entity(datalist_get('default_site')); +if ($site = elgg_get_site_entity()) { if (!($site instanceof ElggSite)) { throw new InstallationException(elgg_echo('InvalidParameterException:NonElggSite')); } |