Reinstating plugin hooks for access collections.

git-svn-id: https://code.elgg.org/elgg/trunk@1469 36083f99-b078-4883-b0ff-0f9b5a30f544

1 files changed, 9 insertions, 3 deletions

diff --git a/engine/lib/access.php b/engine/lib/access.php
index 7284ff54d..63df1549b 100644
--- a/engine/lib/access.php
+++ b/engine/lib/access.php
@@ -90,8 +90,12 @@
 				

 				$access_array[$user_id] = $tmp_access_array;

 				

+			} else {

+				$tmp_access_array = $access_array[$user_id];

 			}

 			

+			$tmp_access_array = trigger_plugin_hook('access:collections','user',array('user_id' => $user_id, 'site_id' => $site_id),$tmp_access_array);

+			

 			return $access_array[$user_id];

 			

 		}

@@ -159,13 +163,15 @@
 						$tmp_access_array[$collection->id] = $collection->name;

 				}

 				

-				$tmp_access_array = trigger_plugin_hook('access','user',array('user_id' => $user_id, 'site_id' => $site_id),$tmp_access_array);

-				

 				$access_array[$user_id] = $tmp_access_array;

 				

+			} else {

+				$tmp_access_array = $access_array[$user_id];

 			}

 			

-			return $access_array[$user_id];

+			$tmp_access_array = trigger_plugin_hook('access:collections:write','user',array('user_id' => $user_id, 'site_id' => $site_id),$tmp_access_array);

+			

+			return $tmp_access_array;

 			

 		}