Merge branch 'master' into tres

Conflicts:
	include/group.php
	include/text.php
	mod/acl.php
	mod/channel.php
	mod/connections.php
	mod/display.php
	mod/group.php
	mod/item.php
	mod/locs.php
	mod/network.php
	mod/photos.php
	mod/ping.php
	mod/starred.php
	mod/viewsrc.php

1 files changed, 2 insertions, 2 deletions

diff --git a/mod/notes.php b/mod/notes.php
index 84f8a7093..4bb97fc9e 100644
--- a/mod/notes.php
+++ b/mod/notes.php
@@ -2,13 +2,13 @@
 
 function notes_init(&$a) {
 
-	if(! local_user())
+	if(! local_channel())
 		return;
 
 	$ret = array('success' => true);
 	if($_REQUEST['note_text'] || $_REQUEST['note_text'] == '') {
 		$body = escape_tags($_REQUEST['note_text']);
-		set_pconfig(local_user(),'notes','text',$body);
+		set_pconfig(local_channel(),'notes','text',$body);
 	}
 
 	// push updates to channel clones