Merge branch 'master' into saravea

Conflicts:
	.gitmodules
	mod/admins
	mod/assemblies
	mod/audio_html5
	mod/beechat
	mod/crud
	mod/elgg-activitystreams
	mod/elggman
	mod/elggpg
	mod/favorites
	mod/federated-objects
	mod/friendly_time
	mod/group_alias
	mod/group_operators
	mod/languages
	mod/lightpics
	mod/openid_client
	mod/spotlight
	mod/suicide
	mod/tasks
	mod/videolist

1 files changed, 30 insertions, 0 deletions

diff --git a/mod/river_privacy/start.php b/mod/river_privacy/start.php
new file mode 100644
index 000000000..b836ded52
--- /dev/null
+++ b/mod/river_privacy/start.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * 	River Privacy
+ * 	Makes non-object oriented river entries private
+ * 	eg. friendships
+ */
+
+function river_privacy_init(){
+	if(elgg_get_plugin_setting('hide_old_items', 'river_privacy') != 'no'){
+		elgg_set_view_location('page/components/list', elgg_get_plugins_path() . 'river_privacy/views_override/');
+	}	
+	
+	// set the river item to private if it's not an object
+	elgg_register_plugin_hook_handler('creating', 'river', 'river_privacy_creating_river');
+}
+
+
+//
+// hook called before river creation
+// return associative array of parameters to create the river entry
+function river_privacy_creating_river($hook, $type, $returnvalue, $params){
+	if($returnvalue['type'] != 'object'){
+		$returnvalue['access_id'] = ACCESS_PRIVATE;
+	}
+	
+	return $returnvalue;
+}
+
+elgg_register_event_handler('init', 'system', 'river_privacy_init');
\ No newline at end of file