From 60c1387a16ea4944674b0c9da2273158d1fbf0b4 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sun, 22 Aug 2010 23:15:43 +0000
Subject: Merged r6757:6810 from 1.7 branch into trunk

git-svn-id: http://code.elgg.org/elgg/trunk@6850 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 engine/lib/relationships.php | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engine/lib/relationships.php')

diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php
index bf55a8932..dd8a2b188 100644
--- a/engine/lib/relationships.php
+++ b/engine/lib/relationships.php
@@ -502,6 +502,7 @@ function get_entity_relationships($guid, $inverse_relationship = FALSE) {
  * 	inverse_relationship => BOOL Inverse the relationship
  *
  * @return array
+ * @since 1.7.0
  */
 function elgg_get_entities_from_relationship($options) {
 	$defaults = array(
@@ -547,6 +548,7 @@ function elgg_get_entities_from_relationship($options) {
  * @param $relationship relationship string
  * @param $entity_guid entity guid to check
  * @return mixed
+ * @since 1.7.0
  */
 function elgg_get_entity_relationship_where_sql($table, $relationship = NULL, $relationship_guid = NULL, $inverse_relationship = FALSE) {
 	if ($relationship == NULL && $entity_guid == NULL) {
-- 
cgit v1.2.3