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

diff --git a/mod/photos.php b/mod/photos.php
index 5b86da2a1..c6ad92abc 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -11,7 +11,7 @@ require_once('include/Contact.php');
 function photos_init(&$a) {
 
 
-	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+	if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
 		return;
 	}
 
@@ -122,11 +122,11 @@ function photos_post(&$a) {
 
 			// get the list of photos we are about to delete
 
-			if(remote_user() && (! local_user())) {
-				$str = photos_album_get_db_idstr($page_owner_uid,$album,remote_user());
+			if(remote_channel() && (! local_channel())) {
+				$str = photos_album_get_db_idstr($page_owner_uid,$album,remote_channel());
 			}
-			elseif(local_user()) {
-				$str = photos_album_get_db_idstr(local_user(),$album);
+			elseif(local_channel()) {
+				$str = photos_album_get_db_idstr(local_channel(),$album);
 			}
 			else {
 				$str = null;
@@ -166,7 +166,7 @@ function photos_post(&$a) {
 
 		$r = q("SELECT `id`, `resource_id` FROM `photo` WHERE ( xchan = '%s' or `uid` = %d ) AND `resource_id` = '%s' LIMIT 1",
 			dbesc($ob_hash),
-			intval(local_user()),
+			intval(local_channel()),
 			dbesc($a->argv[2])
 		);
 
@@ -343,7 +343,7 @@ function photos_post(&$a) {
 			require_once('include/text.php');
 			$profile_uid = $a->profile['profile_uid'];
 
-			$results = linkify_tags($a, $rawtags, (local_user()) ? local_user() : $profile_uid);
+			$results = linkify_tags($a, $rawtags, (local_channel()) ? local_channel() : $profile_uid);
 
 			$success = $results['success'];
 			$post_tags = array();
@@ -414,7 +414,7 @@ function photos_content(&$a) {
 	// photos/name/image/xxxxx
 
 
-	if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+	if((get_config('system','block_public')) && (! local_channel()) && (! remote_channel())) {
 		notice( t('Public access denied.') . EOL);
 		return;
 	}
@@ -483,7 +483,7 @@ function photos_content(&$a) {
 
 	// tabs
 
-	$_is_owner = (local_user() && (local_user() == $owner_uid));
+	$_is_owner = (local_channel() && (local_channel() == $owner_uid));
 	$o .= profile_tabs($a,$_is_owner, $a->data['channel']['channel_address']);	
 
 	/**
@@ -865,10 +865,10 @@ function photos_content(&$a) {
 				}
 			}
 
-			if((local_user()) && (local_user() == $link_item['uid'])) {
+			if((local_channel()) && (local_user() == $link_item['uid'])) {
 				q("UPDATE `item` SET item_unseen = 0 WHERE parent = %d and uid = %d and item_unseen = 1",
 					intval($link_item['parent']),
-					intval(local_user())
+					intval(local_channel())
 				);
 			}
 		}