aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-03 04:27:53 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-11-03 04:27:53 +0000
commitcea7ae1901061b65a62127f525d4361a44438332 (patch)
tree8b08c49c53aec818dbeb987b98a92c7c8a245a19 /engine
parent620a8adc6da005d842116a38700f79a82de7bdcc (diff)
downloadelgg-cea7ae1901061b65a62127f525d4361a44438332.tar.gz
elgg-cea7ae1901061b65a62127f525d4361a44438332.tar.bz2
Fixes #2134: Moved getContainerEntity() method to ElggEntity
git-svn-id: http://code.elgg.org/elgg/trunk@7219 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine')
-rw-r--r--engine/classes/ElggEntity.php31
-rw-r--r--engine/classes/ElggObject.php37
2 files changed, 31 insertions, 37 deletions
diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php
index ea2c52c22..ef38bee6b 100644
--- a/engine/classes/ElggEntity.php
+++ b/engine/classes/ElggEntity.php
@@ -721,6 +721,37 @@ abstract class ElggEntity extends ElggData implements
public function getOwnerEntity() {
return get_entity($this->owner_guid);
}
+
+ /**
+ * Set the container for this object.
+ *
+ * @param int $container_guid The ID of the container.
+ *
+ * @return bool
+ */
+ public function setContainer($container_guid) {
+ $container_guid = (int)$container_guid;
+
+ return $this->set('container_guid', $container_guid);
+ }
+
+ /**
+ * Returns the container GUID of this object.
+ *
+ * @return int
+ */
+ public function getContainer() {
+ return $this->get('container_guid');
+ }
+
+ /**
+ * Returns the container entity for this object.
+ *
+ * @return ElggEntity
+ */
+ public function getContainerEntity() {
+ return get_entity($this->getContainer());
+ }
/**
* Returns the UNIX epoch time that this entity was last updated
diff --git a/engine/classes/ElggObject.php b/engine/classes/ElggObject.php
index b8e733903..b721c479c 100644
--- a/engine/classes/ElggObject.php
+++ b/engine/classes/ElggObject.php
@@ -179,43 +179,6 @@ class ElggObject extends ElggEntity {
return add_site_object($this->getGUID(), $site_guid);
}
- /**
- * Set the container for this object.
- *
- * @param int $container_guid The ID of the container.
- *
- * @return bool
- */
- function setContainer($container_guid) {
- $container_guid = (int)$container_guid;
-
- return $this->set('container_guid', $container_guid);
- }
-
- /**
- * Returns the container GUID of this object.
- *
- * @return int
- */
- function getContainer() {
- return $this->get('container_guid');
- }
-
- /**
- * Returns the contain entity for this object.
- *
- * @return mixed ElggGroup object or false.
- */
- function getContainerEntity() {
- $result = get_entity($this->getContainer());
-
- if (($result) && ($result instanceof ElggGroup)) {
- return $result;
- }
-
- return false;
- }
-
/*
* EXPORTABLE INTERFACE
*/