diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-10-23 10:53:26 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-10-23 10:53:26 -0700 |
| commit | 5d38476faf775ce6c639d20bc685a7117d29b8f5 (patch) | |
| tree | 80d28d69e5a066ba5f2e10d108175813d9432c0f /engine/classes/ElggSite.php | |
| parent | f1be73852439f5eb7a9f6fdf1e9587f7b2346f69 (diff) | |
| parent | a18ba9dad699ca785e4d8fc37a5fe95a060584e0 (diff) | |
| download | elgg-5d38476faf775ce6c639d20bc685a7117d29b8f5.tar.gz elgg-5d38476faf775ce6c639d20bc685a7117d29b8f5.tar.bz2 | |
Merge branch 'master' of github.com:Elgg/Elgg
Diffstat (limited to 'engine/classes/ElggSite.php')
| -rw-r--r-- | engine/classes/ElggSite.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php index 8708800cf..16b80b9d3 100644 --- a/engine/classes/ElggSite.php +++ b/engine/classes/ElggSite.php @@ -190,18 +190,19 @@ class ElggSite extends ElggEntity { * @note You cannot disable the current site. * * @param string $reason Optional reason for disabling + * @param bool $recursive Recursively disable all contained entities? * * @return bool * @throws SecurityException */ - public function disable($reason = "") { + public function disable($reason = "", $recursive = true) { global $CONFIG; if ($CONFIG->site->getGUID() == $this->guid) { throw new SecurityException('SecurityException:deletedisablecurrentsite'); } - return parent::disable($reason); + return parent::disable($reason, $recursive); } /** @@ -225,7 +226,7 @@ class ElggSite extends ElggEntity { 'offset' => $offset, ); } - + $defaults = array( 'relationship' => 'member_of_site', 'relationship_guid' => $this->getGUID(), |