Refs #2597: Pushed getOwner and getOwnerEntity into ElggEntity and ElggExtender

git-svn-id: http://code.elgg.org/elgg/trunk@7172 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/classes/ElggData.php b/engine/classes/ElggData.php
index 551f806f6d301c0c1e8e1dcc014e5fcd4c8ed9ac..4591c499dc2d3b2d13c528b7392d52514001b0aa 100644 (file)
--- a/engine/classes/ElggData.php
+++ b/engine/classes/ElggData.php
@@ -92,25 +92,7 @@ abstract class ElggData implements
         * @return bool
         */
        abstract public function delete();
-       
-       /**
-        * 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->owner_guid);
-       }
-       
+               
        /**
         * Returns the UNIX epoch time that this entity was created
         *

diff --git a/engine/classes/ElggEntity.php b/engine/classes/ElggEntity.php
index 2128a35e96810eaf2203489551615a5e2aca3601..ea2c52c22f0bb326d7120672ea5b2b6165450c00 100644 (file)
--- a/engine/classes/ElggEntity.php
+++ b/engine/classes/ElggEntity.php
@@ -704,6 +704,24 @@ abstract class ElggEntity extends ElggData implements
                return get_subtype_from_id($this->get('subtype'));
        }
 
+       /**
+        * 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->owner_guid);
+       }
+       
        /**
         * Returns the UNIX epoch time that this entity was last updated
         *

diff --git a/engine/classes/ElggExtender.php b/engine/classes/ElggExtender.php
index 0379cc492ec749fc735a93b3a4718b58e8d5ff06..8d0f4bd66db476292de3952e583aef38018a3293 100644 (file)
--- a/engine/classes/ElggExtender.php
+++ b/engine/classes/ElggExtender.php
@@ -79,6 +79,24 @@ abstract class ElggExtender extends ElggData
                return true;
        }
 
+       /**
+        * 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->owner_guid);
+       }
+       
        /**
         * Return the entity this describes.
         *