aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/classes/ElggEntity.php18
-rw-r--r--engine/tests/objects/objects.php6
2 files changed, 18 insertions, 6 deletions
diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php
index de57d7a07..c6ab51148 100644
--- a/engine/classes/ElggEntity.php
+++ b/engine/classes/ElggEntity.php
@@ -747,21 +747,33 @@ abstract class ElggEntity extends ElggData implements
}
/**
- * Returns the container GUID of this object.
+ * Gets the container GUID for this entity.
*
* @return int
*/
+ public function getContainerGUID() {
+ return $this->get('container_guid');
+ }
+
+ /**
+ * Gets the container GUID for this entity.
+ *
+ * @return int
+ * @deprecated 1.8 Use getContainerGUID()
+ */
public function getContainer() {
+ elgg_deprecated_notice("ElggObject::getContainer deprecated for ElggEntity::getContainerGUID", 1.8);
return $this->get('container_guid');
}
/**
- * Returns the container entity for this object.
+ * Get the container entity for this object.
*
* @return ElggEntity
+ * @since 1.8.0
*/
public function getContainerEntity() {
- return get_entity($this->getContainer());
+ return get_entity($this->getContainerGUID());
}
/**
diff --git a/engine/tests/objects/objects.php b/engine/tests/objects/objects.php
index 95f507695..55734be13 100644
--- a/engine/tests/objects/objects.php
+++ b/engine/tests/objects/objects.php
@@ -144,15 +144,15 @@ class ElggCoreObjectTest extends ElggCoreUnitTest {
}
public function testElggObjectContainer() {
- $this->assertEqual($this->entity->getContainer(), get_loggedin_userid());
+ $this->assertEqual($this->entity->getContainerGUID(), get_loggedin_userid());
// create and save to group
$group = new ElggGroup();
$guid = $group->save();
- $this->assertTrue($this->entity->setContainer($guid));
+ $this->assertTrue($this->entity->setContainerGUID($guid));
// check container
- $this->assertEqual($this->entity->getContainer(), $guid);
+ $this->assertEqual($this->entity->getContainerGUID(), $guid);
$this->assertIdentical($group, $this->entity->getContainerEntity());
// clean up