Merge remote-tracking branch 'upstream/master'

3 files changed, 11 insertions, 2 deletions

diff --git a/mod/editpost.php b/mod/editpost.php
index 918a70d36..8c4117e7a 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -92,6 +92,15 @@ function editpost_content(&$a) {
 
 	}
 
+	if($itm[0]['attach']) {
+		$j = json_decode($itm[0]['attach'],true);
+		if($j) {
+			foreach($j as $jj) {
+				$itm[0]['body'] .= "\n" . '[attachment]' . basename($jj['href']) . ',' . $jj['revision'] . '[/attachment]' . "\n";
+			}
+		}
+	}
+
 	$cipher = get_pconfig(get_app()->profile['profile_uid'],'system','default_cipher');
 	if(! $cipher)
 		$cipher = 'aes256';
diff --git a/mod/item.php b/mod/item.php
index 54c9f128a..fef9bfb6d 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -44,7 +44,7 @@ function item_post(&$a) {
 
 	call_hooks('post_local_start', $_REQUEST);
 
-	// logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
+//	 logger('postvars ' . print_r($_REQUEST,true), LOGGER_DATA);
 
 	$api_source = ((x($_REQUEST,'api_source') && $_REQUEST['api_source']) ? true : false);
 
diff --git a/mod/post.php b/mod/post.php
index 919f09a35..6c57bfa0d 100644
--- a/mod/post.php
+++ b/mod/post.php
@@ -828,7 +828,7 @@ function post_post(&$a) {
 				'xchan_guid'     => $sender['guid'], 
 				'xchan_guid_sig' => $sender['guid_sig'],
 				'hubloc_url'     => $sender['url']
-			),null);
+			),null,(($msgtype === 'force_refresh') ? true : false));
 		}
 		$ret['success'] = true;
 		json_return_and_die($ret);