From: Cash Costello <cash.costello@gmail.com>
Date: Sun, 10 Mar 2013 16:14:15 +0000 (-0400)
Subject: Fixes #4823 returning ElggRelationship from check_entity_relationship() rather than... 
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f3ff77d0260b9bf9c9d60f3cb4e545e2761412b9;p=lorea%2Felgg.git

Fixes #4823 returning ElggRelationship from check_entity_relationship() rather than stdClass object
---

diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php
index c1a7cc080..fe0b8364d 100644
--- a/engine/lib/relationships.php
+++ b/engine/lib/relationships.php
@@ -109,7 +109,7 @@ function add_entity_relationship($guid_one, $relationship, $guid_two) {
  * @param string $relationship The type of relationship
  * @param int    $guid_two     The GUID of the entity the relationship is with
  *
- * @return object|false Depending on success
+ * @return ElggRelationship|false Depending on success
  */
 function check_entity_relationship($guid_one, $relationship, $guid_two) {
 	global $CONFIG;
@@ -123,7 +123,7 @@ function check_entity_relationship($guid_one, $relationship, $guid_two) {
 			AND relationship='$relationship'
 			AND guid_two=$guid_two limit 1";
 
-	$row = get_data_row($query);
+	$row = row_to_elggrelationship(get_data_row($query));
 	if ($row) {
 		return $row;
 	}