Merge remote-tracking branch 'upstream/master'

4 files changed, 7 insertions, 25 deletions

diff --git a/mod/item.php b/mod/item.php
index dc005bb20..2feb64a37 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -269,7 +269,7 @@ function item_post(&$a) {
 		$coord             = $orig_post['coord'];
 		$verb              = $orig_post['verb'];
 		$app               = $orig_post['app'];
-		$title             = escape_tags(trim($_REQUEST['title']));
+		$title             = $_REQUEST['title'];
 		$body              = $_REQUEST['body'];
 		$private           = $orig_post['item_private'];
 		$item_flags        = $orig_post['item_flags'];
diff --git a/mod/photos.php b/mod/photos.php
index 2fe2d8a74..e2279188a 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -27,7 +27,7 @@ function photos_init(&$a) {
 		if(! $channelx)
 			return;
 
-		$a->data['channel'] = $channelx[0];
+		$a->data['channel'] = $channelx;
 
 		$observer = $a->get_observer();
 		$a->data['observer'] = $observer;
diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index 6e9443f12..47c097416 100644
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -1,23 +1,12 @@
 <?php
 
 require_once('include/attach.php');
-require_once('include/datetime.php');
+require_once('include/identity.php');
 
 function wall_attach_post(&$a) {
 
-	// Figure out who owns the page and if they allow attachments
-
-	if(argc() > 1) {
-		$nick = argv(1);
-		$r = q("SELECT channel.* from channel where channel_address = '%s' limit 1",
-			dbesc($nick)
-		);
-		if(! $r)
-			killme();
-		$channel = $r[0];
-
-	}
-
+	if(argc() > 1)
+		$channel = get_channel_by_nick(argv(1));
 	else
 		killme();
 
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index dd5d760b3..2939cf0d1 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,6 +1,7 @@
 <?php
 
 require_once('include/photo/photo_driver.php');
+require_once('include/identity.php');
 require_once('include/photos.php');
 
 
@@ -19,15 +20,7 @@ function wall_upload_post(&$a) {
 			$nick = argv(1);
 	}
 
-	$channel = null;
-
-	if($nick) {		
-		$r = q("SELECT channel.* from channel where channel_address = '%s' limit 1",
-			dbesc($nick)
-		);
-		if($r)
-			$channel = $r[0];
-	}
+	$channel = (($nick) ? get_channel_by_nick($nick) : false);
 
 	if(! $channel) {
 		if($using_api)