diff options
| -rw-r--r-- | engine/classes/ElggSite.php | 10 | ||||
| -rw-r--r-- | engine/lib/sites.php | 1 |
2 files changed, 8 insertions, 3 deletions
diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php index aa94b9fd2..68a720bfe 100644 --- a/engine/classes/ElggSite.php +++ b/engine/classes/ElggSite.php @@ -277,6 +277,9 @@ class ElggSite extends ElggEntity { /** * Returns an array of ElggObject entities that belong to the site. * + * @warning This only returns objects that have been explicitly added to the + * site through addObject() + * * @param string $subtype Entity subtype * @param int $limit Limit * @param int $offset Offset @@ -284,7 +287,7 @@ class ElggSite extends ElggEntity { * @return array */ public function getObjects($subtype = "", $limit = 10, $offset = 0) { - get_site_objects($this->getGUID(), $subtype, $limit, $offset); + return get_site_objects($this->getGUID(), $subtype, $limit, $offset); } /** @@ -317,9 +320,10 @@ class ElggSite extends ElggEntity { * @param int $offset Offset * * @return unknown - * @todo Unimplemented + * @deprecated 1.8 Was never implemented */ public function getCollections($subtype = "", $limit = 10, $offset = 0) { + elgg_deprecated_notice("ElggSite::getCollections() is deprecated", 1.8); get_site_collections($this->getGUID(), $subtype, $limit, $offset); } @@ -348,6 +352,7 @@ class ElggSite extends ElggEntity { * @link http://docs.elgg.org/Tutorials/WalledGarden * * @return void + * @since 1.8.0 */ public function checkWalledGarden() { global $CONFIG; @@ -371,6 +376,7 @@ class ElggSite extends ElggEntity { * @param string $url Defaults to the current URL. * * @return bool + * @since 1.8.0 */ public function isPublicPage($url = '') { global $CONFIG; diff --git a/engine/lib/sites.php b/engine/lib/sites.php index f8590a4e0..a348d166b 100644 --- a/engine/lib/sites.php +++ b/engine/lib/sites.php @@ -215,7 +215,6 @@ function remove_site_object($site_guid, $object_guid) { */ function get_site_objects($site_guid, $subtype = "", $limit = 10, $offset = 0) { $site_guid = (int)$site_guid; - $subtype = sanitise_string($subtype); $limit = (int)$limit; $offset = (int)$offset; |