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

diff --git a/mod/api.php b/mod/api.php
index 4fa911f14..08978ee96 100644
--- a/mod/api.php
+++ b/mod/api.php
@@ -22,12 +22,12 @@ function oauth_get_client($request){
 
 function api_post(&$a) {
 
-	if(! local_user()) {
+	if(! local_channel()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
 
-	if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_user()) {
+	if(count($a->user) && x($a->user,'uid') && $a->user['uid'] != local_channel()) {
 		notice( t('Permission denied.') . EOL);
 		return;
 	}
@@ -57,8 +57,8 @@ function api_content(&$a) {
 			if (is_null($app)) return "Invalid request. Unknown token.";
 			$consumer = new OAuthConsumer($app['client_id'], $app['pw'], $app['redirect_uri']);
 
-			$verifier = md5($app['secret'].local_user());
-			set_config("oauth", $verifier, local_user());
+			$verifier = md5($app['secret'].local_channel());
+			set_config("oauth", $verifier, local_channel());
 			
 			
 			if ($consumer->callback_url!=null) {
@@ -84,7 +84,7 @@ function api_content(&$a) {
 		}
 		
 		
-		if(! local_user()) {
+		if(! local_channel()) {
 			//TODO: we need login form to redirect to this page
 			notice( t('Please login to continue.') . EOL );
 			return login(false,'api-login',$request->get_parameters());