aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 23:59:40 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-10-30 23:59:40 +0000
commit368cc50361cfe6a4fc3d8eec976ce67e080a55b4 (patch)
treeb2aa7c00bf4e6d542ca4ecba4c5017892582bea7
parent09f229f4664ed51dfd06d545db2f32bca3b9acf2 (diff)
downloadelgg-368cc50361cfe6a4fc3d8eec976ce67e080a55b4.tar.gz
elgg-368cc50361cfe6a4fc3d8eec976ce67e080a55b4.tar.bz2
Refs #2597: pulled getOwner and getOwnerEntity functions into ElggData
I thought this would be OK even though relationships don't technically have owners because ElggRelationship implemented the getObectOwnerGUID method git-svn-id: http://code.elgg.org/elgg/trunk@7156 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/classes/ElggData.php19
-rw-r--r--engine/classes/ElggEntity.php18
-rw-r--r--engine/classes/ElggExtender.php19
3 files changed, 17 insertions, 39 deletions
diff --git a/engine/classes/ElggData.php b/engine/classes/ElggData.php
index a206964fa..b21646df1 100644
--- a/engine/classes/ElggData.php
+++ b/engine/classes/ElggData.php
@@ -4,8 +4,23 @@ abstract class ElggData implements
Iterator, // Override foreach behaviour
ArrayAccess // Override for array access
{
-
-
+ /**
+ * Return the guid of the entity's owner.
+ *
+ * @return int The owner GUID
+ */
+ public function getOwner() {
+ return $this->owner_guid;
+ }
+
+ /**
+ * Returns the ElggEntity or child object of the owner of the entity.
+ *
+ * @return ElggEntity The owning user
+ */
+ public function getOwnerEntity() {
+ return get_entity($this->getOwner());
+ }
/*
* SYSTEM LOG INTERFACE
diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php
index 9b6b04899..5d0e030fc 100644
--- a/engine/classes/ElggEntity.php
+++ b/engine/classes/ElggEntity.php
@@ -731,24 +731,6 @@ abstract class ElggEntity extends ElggData implements
}
/**
- * Return the guid of the entity's owner.
- *
- * @return int The owner GUID
- */
- public function getOwner() {
- return $this->get('owner_guid');
- }
-
- /**
- * Returns the ElggEntity or child object of the owner of the entity.
- *
- * @return ElggEntity The owning user
- */
- public function getOwnerEntity() {
- return get_entity($this->get('owner_guid'));
- }
-
- /**
* Returns the entity type
*
* @return string Entity type
diff --git a/engine/classes/ElggExtender.php b/engine/classes/ElggExtender.php
index ca92dca74..2c2669e28 100644
--- a/engine/classes/ElggExtender.php
+++ b/engine/classes/ElggExtender.php
@@ -76,25 +76,6 @@ abstract class ElggExtender extends ElggData implements
}
/**
- * Return the owner guid of this extender.
- *
- * @return int
- */
- public function getOwner() {
- return $this->owner_guid;
- }
-
- /**
- * Return the owner entity.
- *
- * @return ElggEntity|false
- * @since 1.7.0
- */
- public function getOwnerEntity() {
- return get_user($this->owner_guid);
- }
-
- /**
* Return the entity this describes.
*
* @return ElggEntity The enttiy