Merge branch 'dev' into containers

3 files changed, 42 insertions, 36 deletions

diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 60a314da0..d21d85105 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -187,7 +187,7 @@ class ThreadItem {
 			$drop = [ 'dropping' => true, 'delete' => t('Admin Delete') ];
 		}
 
-		$filer = ((($conv->get_profile_owner() == local_channel()) && (! array_key_exists('real_uid',$item))) ? t("Save to Folder") : false);
+		$filer = (((local_channel() && $conv->get_profile_owner() === local_channel()) || (local_channel() && App::$module === 'pubstream')) ? t("Save to Folder") : false);
 
 		$profile_avatar = $item['author']['xchan_photo_s'];
 		$profile_link   = chanlink_hash($item['author_xchan']);
diff --git a/Zotlabs/Module/Filer.php b/Zotlabs/Module/Filer.php
index c2747e6c2..bf472eb67 100644
--- a/Zotlabs/Module/Filer.php
+++ b/Zotlabs/Module/Filer.php
@@ -1,43 +1,54 @@
 <?php
 namespace Zotlabs\Module;
 
-require_once('include/security.php');
-require_once('include/bbcode.php');
-require_once('include/items.php');
-
-
+use App;
 
 class Filer extends \Zotlabs\Web\Controller {
 
 	function get() {
-	
-		if(! local_channel()) {
+
+		if(!local_channel()) {
 			killme();
 		}
-	
-		$term = unxmlify(trim($_GET['term']));
-		$item_id = ((\App::$argc > 1) ? intval(\App::$argv[1]) : 0);
-	
+
+		$term = unxmlify(trim($_GET['term'] ?? ''));
+		$item_id = ((App::$argc > 1) ? intval(App::$argv[1]) : 0);
+
 		logger('filer: tag ' . $term . ' item ' . $item_id);
-	
+
 		if($item_id && strlen($term)){
+
+			$sys = get_sys_channel();
+
+			$r = q("SELECT * FROM item WHERE (uid = %d OR uid = %d) AND id = %d
+				and item_type in (0,6,7) and item_deleted = 0 and item_unpublished = 0
+				and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1",
+				intval(local_channel()),
+				intval($sys['channel_id']),
+				intval($item_id)
+			);
+
+			if ($r && $r[0]['uid'] === $sys['channel_id']) {
+				$r = [copy_of_pubitem(App::get_channel(), $r[0]['mid'])];
+			}
+
+			if(!$r) {
+				killme();
+			}
+
+			$item_id = $r[0]['id'];
+
 			// file item
 			store_item_tag(local_channel(),$item_id,TERM_OBJ_POST,TERM_FILE,$term,'');
-	
+
 			// protect the entire conversation from periodic expiration
-	
-			$r = q("select parent from item where id = %d and uid = %d limit 1",
-				intval($item_id),
+
+			q("update item set item_retained = 1, changed = '%s' where id = %d and uid = %d",
+				dbesc(datetime_convert()),
+				intval($r[0]['parent']),
 				intval(local_channel())
 			);
-			if($r) {
-				$x = q("update item set item_retained = 1, changed = '%s' where id = %d and uid = %d",
-					dbesc(datetime_convert()),
-					intval($r[0]['parent']),
-					intval(local_channel())
-				);
-			}
-		} 
+		}
 		else {
 			$filetags = array();
 			$r = q("select distinct(term) from term where uid = %d and ttype = %d order by term asc",
@@ -55,10 +66,10 @@ class Filer extends \Zotlabs\Web\Controller {
 				'$title' => t('Save to Folder'),
 				'$cancel' => t('Cancel')
 			));
-			
+
 			echo $o;
 		}
 		killme();
 	}
-	
+
 }
diff --git a/include/items.php b/include/items.php
index 16522b0a6..2aed53b3c 100644
--- a/include/items.php
+++ b/include/items.php
@@ -5148,25 +5148,19 @@ function copy_of_pubitem($channel, $mid) {
 		return $item[0];
 	}
 
-
-	$r = q("select * from item where parent_mid = (select parent_mid from item where mid = '%s' and uid = %d ) order by id ",
+	$r = q("select * from item where parent_mid = (select parent_mid from item where mid = '%s' and uid = %d) and uid = %d order by id ",
 		dbesc($mid),
+		intval($syschan['channel_id']),
 		intval($syschan['channel_id'])
 	);
 
 	if($r) {
 		$items = fetch_post_tags($r,true);
 		foreach($items as $rv) {
-			$d = q("select id from item where mid = '%s' and uid = %d limit 1",
-				dbesc($rv['mid']),
-				intval($channel['channel_id'])
-			);
-			if($d) {
-				continue;
-			}
 
 			unset($rv['id']);
 			unset($rv['parent']);
+
 			$rv['aid'] = $channel['channel_account_id'];
 			$rv['uid'] = $channel['channel_id'];
 			$rv['item_wall'] = 0;
@@ -5180,6 +5174,7 @@ function copy_of_pubitem($channel, $mid) {
 
 		}
 	}
+
 	return $result;
 }