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/viewsrc.php

@@ -10,7 +10,7 @@ function viewsrc_content(&$a) {
 	$item_id = ((argc() > 1) ? intval(argv(1)) : 0);
 	$json    = ((argc() > 2 && argv(2) === 'json') ? true : false);
 
-	if(! local_user()) {
+	if(! local_channel()) {
 		notice( t('Permission denied.') . EOL);
 	}
 
@@ -20,9 +20,10 @@ function viewsrc_content(&$a) {
 		notice( t('Item not found.') . EOL);
 	}
 
-	if(local_user() && $item_id) {
+
+	if(local_channel() && $item_id) {
 		$r = q("select id, item_flags, item_obscured, body from item where item_restrict = 0 and uid in (%d , %d) and id = %d limit 1",
-			intval(local_user()),
+			intval(local_channel()),
 			intval($sys['channel_id']),
 			intval($item_id)
 		);