aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-09-04 11:01:52 +0000
committerdave <dave@36083f99-b078-4883-b0ff-0f9b5a30f544>2009-09-04 11:01:52 +0000
commitc9ada1c0365a31d1340f603df5b4b8bd933dad14 (patch)
tree56730e783f4b563bb752ddf27c414508829add62
parentb405f7f30fb3cee2d00b20972a7da910a7947e04 (diff)
downloadelgg-c9ada1c0365a31d1340f603df5b4b8bd933dad14.tar.gz
elgg-c9ada1c0365a31d1340f603df5b4b8bd933dad14.tar.bz2
Patch submitted for ticket #886 rolled back as it was causing #1205 -> #886 will need further investigating
git-svn-id: https://code.elgg.org/elgg/trunk@3462 36083f99-b078-4883-b0ff-0f9b5a30f544
-rw-r--r--engine/lib/relationships.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php
index 47ab619d6..27a9917ba 100644
--- a/engine/lib/relationships.php
+++ b/engine/lib/relationships.php
@@ -511,8 +511,7 @@
$relationship_guid = (int)$relationship_guid;
$inverse_relationship = (bool)$inverse_relationship;
$type = sanitise_string($type);
- if ($subtype AND !$subtype = get_subtype_id($type, $subtype))
- return false;
+ $subtype = get_subtype_id($type, $subtype);
$owner_guid = (int)$owner_guid;
if ($order_by == "") $order_by = "time_created desc";
else $order_by = "time_created, {$order_by}";