From: rabuzarus <trebor@central-unit>
Date: Sun, 11 Oct 2015 17:39:55 +0000 (+0200)
Subject: Merge develop-new into event-attendance-new
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=649578ae333e70280f8100b36f7d9e95cf27b64a;p=friendica.git

Merge develop-new into event-attendance-new

Conflicts:
	include/conversation.php
---

649578ae333e70280f8100b36f7d9e95cf27b64a
diff --cc object/Item.php
index 283745d34d,63fa43d3e2..3050365f92
--- a/object/Item.php
+++ b/object/Item.php
@@@ -343,10 -331,8 +349,10 @@@ class Item extends BaseObject 
  			'text' => $text_e,
  			'id' => $this->get_id(),
  			'guid' => urlencode($item['guid']),
 +			'isevent' => $isevent,
 +			'attend' => $attend,
  			'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
- 			'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $this->get_owner_name(), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
+ 			'olinktitle' => sprintf( t('View %s\'s profile @ %s'), htmlentities($this->get_owner_name()), ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
  			'to' => t('to'),
  			'via' => t('via'),
  			'wall' => t('Wall-to-Wall'),
@@@ -378,11 -364,10 +384,11 @@@
  			'filer'     => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''),
  			'drop' => $drop,
  			'vote' => $buttons,
 -			'like' => $like,
 -                        'dislike'   => $dislike,
 +			'like' => $responses['like']['output'],
 +			'dislike'   => $responses['dislike']['output'],
 +			'responses' => $responses,
  			'switchcomment' => t('Comment'),
- 			'comment' => $this->get_comment_box($indent),
+ 			'comment' => $comment,
  			'previewing' => ($conv->is_preview() ? ' preview ' : ''),
  			'wait' => t('Please wait'),
  			'thread_level' => $thread_level,