diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-01-29 19:11:02 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2010-01-29 19:11:02 +0000 |
| commit | 63a047afd6d4538c2ace3d5eb7f8a43b838572ac (patch) | |
| tree | 248c37e5dd3940a764b8519c435cccfbaf8d0341 | |
| parent | 35c39df3d382f5e79d8833bebcfaeb4041c9c3e6 (diff) | |
| download | elgg-63a047afd6d4538c2ace3d5eb7f8a43b838572ac.tar.gz elgg-63a047afd6d4538c2ace3d5eb7f8a43b838572ac.tar.bz2 | |
Fixes #1472: get_entity_relationships() supports inverse relationships.
git-svn-id: http://code.elgg.org/elgg/trunk@3856 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | CHANGES.txt | 2 | ||||
| -rw-r--r-- | engine/lib/relationships.php | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 5414aefef..d88332adf 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -19,6 +19,7 @@ http://code.elgg.org/elgg/..... * ElggPlugin get() now works with 0. #1286 * Metadata __isset() now works for falsy values (except NULL). #1414 * clear_plugin_setting() now only clears a single setting. + * Submenu entries are correctly calculated after a simplecache refresh. API changes: * New plugin hook system:unit_test for adding files to unit tests. @@ -33,6 +34,7 @@ http://code.elgg.org/elgg/..... * remove_from_river_by_annotation() added. * unregister_elgg_event_handler() and unregister_plugin_hook() added. #1465 * clear_all_plugin_settings() added. + * get_entity_relationships() supports inverse relationships. #1472. Services API: * Separated user and api authenticate processing diff --git a/engine/lib/relationships.php b/engine/lib/relationships.php index d84e70bfb..c1f54472a 100644 --- a/engine/lib/relationships.php +++ b/engine/lib/relationships.php @@ -470,12 +470,14 @@ function remove_entity_relationships($guid_one, $relationship = "", $inverse = f * * @param int $guid */ -function get_entity_relationships($guid) { +function get_entity_relationships($guid, $inverse_relationship = FALSE) { global $CONFIG; $guid = (int)$guid; - $query = "SELECT * from {$CONFIG->dbprefix}entity_relationships where guid_one=$guid"; + $where = ($inverse_relationship ? "guid_two='$guid'" : "guid_one='$guid'"); + + $query = "SELECT * from {$CONFIG->dbprefix}entity_relationships where {$where}"; return get_data($query, "row_to_elggrelationship"); } |