aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2013-03-10 12:14:15 -0400
committerCash Costello <cash.costello@gmail.com>2013-03-10 12:14:15 -0400
commitf3ff77d0260b9bf9c9d60f3cb4e545e2761412b9 (patch)
tree2225e7fe510039ee8894058944624766a47daad1 /engine
parent473b5065a21544c6d66dd82e024d4f1f0d58ff87 (diff)
downloadelgg-f3ff77d0260b9bf9c9d60f3cb4e545e2761412b9.tar.gz
elgg-f3ff77d0260b9bf9c9d60f3cb4e545e2761412b9.tar.bz2
Fixes #4823 returning ElggRelationship from check_entity_relationship() rather than stdClass object
Diffstat (limited to 'engine')
-rw-r--r--engine/lib/relationships.php4
1 files changed, 2 insertions, 2 deletions
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;
}