Merge remote-tracking branch 'upstream/master'

1 files changed, 2 insertions, 16 deletions

diff --git a/include/items.php b/include/items.php
index 6b9ecdd48..c303801e7 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1427,22 +1427,8 @@ function item_store($arr,$force_parent = false) {
 				$arr['item_private'] = 0;
 		}
 		else {
-
-			// Allow one to see reply tweets from status.net even when
-			// we don't have or can't see the original post.
-
-			if($force_parent) {
-				logger('item_store: $force_parent=true, reply converted to top-level post.');
-				$parent_id = 0;
-				$arr['parent_mid'] = $arr['mid'];
-				$arr['flags'] = $arr['flags'] | ITEM_THREAD_TOP;
-			}
-			else {
-				logger('item_store: item parent was not found - ignoring item');
-				return 0;
-			}
-			
-			$parent_deleted = 0;
+			logger('item_store: item parent was not found - ignoring item');
+			return 0;
 		}
 	}