Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts:
	include/items.php
	include/text.php
	mod/item.php
	view/nl/messages.po

1 files changed, 13 insertions, 2 deletions

diff --git a/mod/item.php b/mod/item.php
index 36cbaff6c..bc637debf 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -447,8 +447,6 @@ function item_post(&$a) {
 		}
 	}
 
-	$post_type = notags(trim($_REQUEST['type']));
-
 	$mimetype = notags(trim($_REQUEST['mimetype']));
 	if(! $mimetype)
 		$mimetype = 'text/bbcode';
@@ -657,6 +655,19 @@ function item_post(&$a) {
 	$item_wall = (($post_type === 'wall' || $post_type === 'wall-comment') ? 1 : 0);
 	$item_origin = (($origin) ? 1 : 0);
 
+
+	// determine if this is a wall post
+
+	if($parent) {
+		$item_wall = $parent_item['item_wall'];
+	}
+	else {
+		if(! $webpage) {
+			$item_wall = 1;
+		}
+	}
+
+
 	if($moderated)
 		$item_restrict = $item_restrict | ITEM_MODERATED;