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/index.php b/index.php
index a13d22d8c..4e39ee1ac 100755
--- a/index.php
+++ b/index.php
@@ -107,7 +107,7 @@ if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
 
 if((x($_GET,'zid')) && (! $a->install)) {
 	$a->query_string = strip_zids($a->query_string);
-	if(! local_user()) {
+	if(! local_channel()) {
 		$_SESSION['my_address'] = $_GET['zid'];
 		zid_init($a);
 	}
@@ -377,7 +377,7 @@ if($a->module_loaded) {
 
 if(x($_SESSION,'visitor_home'))
 	$homebase = $_SESSION['visitor_home'];
-elseif(local_user())
+elseif(local_channel())
 	$homebase = $a->get_baseurl() . '/channel/' . $a->channel['channel_address'];
 
 if(isset($homebase))