aboutsummaryrefslogtreecommitdiff
path: root/engine/lib/relationships.php
diff options
context:
space:
mode:
authorcash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-22 23:15:43 +0000
committercash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-08-22 23:15:43 +0000
commit60c1387a16ea4944674b0c9da2273158d1fbf0b4 (patch)
tree6f94aaf77a7d794f489212ff50f08f5211a18126 /engine/lib/relationships.php
parentca08eb6d170d375ef4fca53604956f3474c7db19 (diff)
downloadelgg-60c1387a16ea4944674b0c9da2273158d1fbf0b4.tar.gz
elgg-60c1387a16ea4944674b0c9da2273158d1fbf0b4.tar.bz2
Merged r6757:6810 from 1.7 branch into trunk
git-svn-id: http://code.elgg.org/elgg/trunk@6850 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'engine/lib/relationships.php')
-rw-r--r--engine/lib/relationships.php2
1 files changed, 2 insertions, 0 deletions
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) {