1 files changed, 15 insertions, 3 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());
 	}
 
 	/**