undo comment policy override - there are a handful of stored posts from the 17th-June with a broken policy (which won't have a comment box) but it seems to be working for both recent and older posts.

3 files changed, 17 insertions, 14 deletions

diff --git a/include/ItemObject.php b/include/ItemObject.php
index e5185bef6..1205ae13e 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -45,10 +45,10 @@ class Item extends BaseObject {
 
 		if(($this->observer) && (! $this->writable)) {
 			$this->commentable = can_comment_on_post($this->observer['xchan_hash'],$data);
-			if(! $this->commentable) {
-				logger('commentable: ' . $data['comment_policy']);
-				$this->commentable = true;
-			}
+//			if(! $this->commentable) {
+//				logger('commentable: ' . $data['comment_policy']);
+//				$this->commentable = true;
+//			}
 		}
 
 //		logger('writable: ' . $this->writable);
diff --git a/include/conversation.php b/include/conversation.php
index 8e69e9ea3..b6823e3c5 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -6,7 +6,7 @@ require_once('include/items.php');
 // is identical to the code in mod/message.php for 'item_extract_images' and
 // 'item_redir_and_replace_images'
 
-if(! function_exists('item_extract_images')) {
+
 function item_extract_images($body) {
 
 	$saved_image = array();
@@ -46,9 +46,9 @@ function item_extract_images($body) {
 	$new_body = $new_body . $orig_body;
 
 	return array('body' => $new_body, 'images' => $saved_image);
-}}
+}
+
 
-if(! function_exists('item_redir_and_replace_images')) {
 function item_redir_and_replace_images($body, $images, $cid) {
 
 	$origbody = $body;
@@ -81,7 +81,7 @@ function item_redir_and_replace_images($body, $images, $cid) {
 	}
 
 	return $newbody;
-}}
+}
 
 
 
@@ -826,7 +826,7 @@ function best_link_url($item) {
 }
 
 
-if(! function_exists('item_photo_menu')){
+
 function item_photo_menu($item){
 	$a = get_app();
 	$contact = null;
@@ -893,9 +893,9 @@ function item_photo_menu($item){
 		elseif ($v!="") $o .= "<li><a href=\"$v\">$k</a></li>\n";
 	}
 	return $o;
-}}
+}
+
 
-if(! function_exists('like_puller')) {
 function like_puller($a,$item,&$arr,$mode) {
 
 	$url = '';
@@ -923,7 +923,7 @@ function like_puller($a,$item,&$arr,$mode) {
 		$arr[$item['thr_parent'] . '-l'][] = '<a href="'. $url . '"'. $sparkle .'>' . $item['author']['xchan_name'] . '</a>';
 	}
 	return;
-}}
+}
 
 // Format the like/dislike text for a profile item
 // $cnt = number of people who like/dislike the item
@@ -932,7 +932,7 @@ function like_puller($a,$item,&$arr,$mode) {
 // $id  = item id
 // returns formatted text
 
-if(! function_exists('format_like')) {
+
 function format_like($cnt,$arr,$type,$id) {
 	$o = '';
 	if($cnt == 1)
@@ -956,7 +956,7 @@ function format_like($cnt,$arr,$type,$id) {
 		$o .= "\t" . '<div id="' . $type . 'list-' . $id . '" style="display: none;" >' . $str . '</div>';
 	}
 	return $o;
-}}
+}
 
 
 function status_editor($a,$x,$popup=false) {
diff --git a/include/enotify.php b/include/enotify.php
index 71629b9d9..3b7a643ed 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -50,6 +50,8 @@ function notification($params) {
 
 	$additional_mail_header = "";
 
+	// We really should pass this through localize_item - but only if we have a complete item. We may only have a couple of elements.
+
 	if(array_key_exists('item',$params)) {
 		$title = $params['item']['title'];
 		$body = $params['item']['body'];
@@ -352,6 +354,7 @@ function notification($params) {
 
 		logger('notification: sending notification email');
 
+
 		$textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n",
 			$body))),ENT_QUOTES,'UTF-8'));