2 files changed, 23 insertions, 13 deletions
diff --git a/include/items.php b/include/items.php
index 0c9d4cfc2..bbd9fbb7c 100644
--- a/include/items.php
+++ b/include/items.php
@@ -740,10 +740,10 @@ function item_store($arr,$force_parent = false) {
 		return 0;
 	}
 
-	if($arr['parent-uri'] === $arr['uri'])
+	if((! $parent_id) || ($arr['parent-uri'] === $arr['uri']))	
 		$parent_id = $current_post;
- 
-	if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid))
+
+ 	if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid))
 		$private = 1;
 	else
 		$private = $arr['private']; 
diff --git a/mod/item.php b/mod/item.php
index 7125ae1f4..38ef580af 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -1,11 +1,17 @@
 <?php
 
-// This is the POST destination for most all locally posted
-// text stuff. This function handles status, wall-to-wall status, 
-// local comments, and remote coments - that are posted on this site 
-// (as opposed to being delivered in a feed).
-// All of these become an "item" which is our basic unit of 
-// information. 
+/**
+ *
+ * This is the POST destination for most all locally posted
+ * text stuff. This function handles status, wall-to-wall status, 
+ * local comments, and remote coments - that are posted on this site 
+ * (as opposed to being delivered in a feed).
+ * All of these become an "item" which is our basic unit of 
+ * information.
+ * Posts that originate externally or do not fall into the above 
+ * posting categories go through item_store() instead of this function. 
+ *
+ */  
 
 function item_post(&$a) {
 
@@ -417,6 +423,12 @@ function item_post(&$a) {
 			);
 		}
 	}
+	else {
+		logger('mod_item: unable to retrieve post that was just stored.');
+		notify( t('System error. Post not saved.'));
+		goaway($a->get_baseurl() . "/" . $_POST['return'] );
+		// NOTREACHED
+	}
 
 	$php_path = ((strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
 
@@ -454,10 +466,8 @@ function item_post(&$a) {
 		}
 	}
 
-
-
 	goaway($a->get_baseurl() . "/" . $_POST['return'] );
-	return; // NOTREACHED
+	// NOTREACHED
 }
 
 
@@ -551,7 +561,7 @@ function item_content(&$a) {
 			proc_run($php_path,"include/notifier.php","drop","$drop_id");
 
 			goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
-			return; //NOTREACHED
+			//NOTREACHED
 		}
 		else {
 			notice( t('Permission denied.') . EOL);