diff options
| -rw-r--r-- | engine/lib/relationships.php | 11 | ||||
| -rw-r--r-- | services/export/handler.php | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php index 4d0db5d66..5313aa841 100644 --- a/engine/lib/relationships.php +++ b/engine/lib/relationships.php @@ -116,12 +116,19 @@ * @return array */ public function export() - { - return new ODDRelationship( + { + global $CONFIG; + + $uuid = $CONFIG->wwwroot . "odd/{$this->guid_one}/relationship/{$this->id}/"; + $relationship = new ODDRelationship( guid_to_uuid($this->guid_one), $this->relationship, guid_to_uuid($this->guid_two) ); + + $relationship->setAttribute('uuid', $uuid); + + return $relationship; } // IMPORTABLE INTERFACE //////////////////////////////////////////////////////////// diff --git a/services/export/handler.php b/services/export/handler.php index 9e7c5fe26..f37921bef 100644 --- a/services/export/handler.php +++ b/services/export/handler.php @@ -92,7 +92,7 @@ if ($r) { if ( - ($r->guid_one!=$entity->guid) || + ($r->guid_one!=$entity->guid) && ($r->guid_two!=$entity->guid) ) throw new InvalidParameterException(elgg_echo('InvalidParameterException:DoesNotBelongOrRefer')); |