diff options
author | cash <cash.costello@gmail.com> | 2013-03-15 11:18:05 -0400 |
---|---|---|
committer | cash <cash.costello@gmail.com> | 2013-03-15 11:18:05 -0400 |
commit | a2ecf54d56d9f877e6f0f8ac6d841cee6187aac4 (patch) | |
tree | ccd5b6029d3f77cc09144132d12fbd2c2e2b0fa4 /engine/classes/ElggSite.php | |
parent | 4cd8bc8d68008f509ce97b2e31e1e5ccfec7bdf0 (diff) | |
download | elgg-a2ecf54d56d9f877e6f0f8ac6d841cee6187aac4.tar.gz elgg-a2ecf54d56d9f877e6f0f8ac6d841cee6187aac4.tar.bz2 |
more coding standard fixes
Diffstat (limited to 'engine/classes/ElggSite.php')
-rw-r--r-- | engine/classes/ElggSite.php | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php index 1a34df195..deba5087e 100644 --- a/engine/classes/ElggSite.php +++ b/engine/classes/ElggSite.php @@ -77,28 +77,24 @@ class ElggSite extends ElggEntity { $msg = elgg_echo('IOException:FailedToLoadGUID', array(get_class(), $guid->guid)); throw new IOException($msg); } - - // Is $guid is an ElggSite? Use a copy constructor } else if ($guid instanceof ElggSite) { + // $guid is an ElggSite so this is a copy constructor elgg_deprecated_notice('This type of usage of the ElggSite constructor was deprecated. Please use the clone method.', 1.7); foreach ($guid->attributes as $key => $value) { $this->attributes[$key] = $value; } - - // Is this is an ElggEntity but not an ElggSite = ERROR! } else if ($guid instanceof ElggEntity) { + // @todo remove and just use else clause throw new InvalidParameterException(elgg_echo('InvalidParameterException:NonElggSite')); - - // See if this is a URL } else if (strpos($guid, "http") !== false) { + // url so retrieve by url $guid = get_site_by_url($guid); foreach ($guid->attributes as $key => $value) { $this->attributes[$key] = $value; } - - // Is it a GUID } else if (is_numeric($guid)) { + // $guid is a GUID so load if (!$this->load($guid)) { throw new IOException(elgg_echo('IOException:FailedToLoadGUID', array(get_class(), $guid))); } |