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/uexport.php b/mod/uexport.php
index 250a001a2..edcb2fa84 100644
--- a/mod/uexport.php
+++ b/mod/uexport.php
@@ -1,7 +1,7 @@
 <?php
 
 function uexport_init(&$a) {
-	if(! local_user())
+	if(! local_channel())
 		killme();
 
 	if(argc() > 1) {
@@ -14,7 +14,7 @@ function uexport_init(&$a) {
 
 
 		if(argc() > 1 && argv(1) === 'basic') {
-			echo json_encode(identity_basic_export(local_user()));
+			echo json_encode(identity_basic_export(local_channel()));
 			killme();
 		}
 
@@ -22,7 +22,7 @@ function uexport_init(&$a) {
 		// It probably needs to be built at the CLI and offered to download as a tarball.  Maybe stored in the members dav.
 
 		if(argc() > 1 && argv(1) === 'complete') {
-			echo json_encode(identity_basic_export(local_user(),true));
+			echo json_encode(identity_basic_export(local_channel(),true));
 			killme();
 		}
 	}