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

mod/mood.php

@@ -7,10 +7,10 @@ require_once('include/items.php');
 
 function mood_init(&$a) {
 
-	if(! local_user())
+	if(! local_channel())
 		return;
 
-	$uid = local_user();
+	$uid = local_channel();
 	$channel = $a->get_channel();
 	$verb = notags(trim($_GET['verb']));
 	
@@ -108,7 +108,7 @@ function mood_init(&$a) {
 
 function mood_content(&$a) {
 
-	if(! local_user()) {
+	if(! local_channel()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}