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, 3 insertions, 3 deletions

diff --git a/mod/starred.php b/mod/starred.php
index 931b24a71..103e5f4b4 100644
--- a/mod/starred.php
+++ b/mod/starred.php
@@ -5,7 +5,7 @@ function starred_init(&$a) {
 
 	$starred = 0;
 
-	if(! local_user())
+	if(! local_channel())
 		killme();
 	if(argc() > 1)
 		$message_id = intval(argv(1));
@@ -13,7 +13,7 @@ function starred_init(&$a) {
 		killme();
 
 	$r = q("SELECT item_flags FROM item WHERE uid = %d AND id = %d LIMIT 1",
-		intval(local_user()),
+		intval(local_channel()),
 		intval($message_id)
 	);
 	if(! count($r))
@@ -23,7 +23,7 @@ function starred_init(&$a) {
 
 	$r = q("UPDATE item SET item_starred = %d WHERE uid = %d and id = %d",
 		intval($item_starred),
-		intval(local_user()),
+		intval(local_channel()),
 		intval($message_id)
 	);