Merge develop-new into event-attendance-new

Conflicts:
	include/conversation.php

diff --cc boot.php
Simple merge

diff --cc include/conversation.php
Simple merge

diff --cc include/features.php
Simple merge

diff --cc include/items.php
Simple merge

diff --cc mod/network.php
Simple merge

diff --cc mod/photos.php
Simple merge

diff --cc object/Item.php
index 283745d34d017edaf519810d52fd320b09321aef,63fa43d3e25eb2feb41e78f8cab56a84bb2432d7..3050365f921fd23ad463ccf354a3cdae9bbab71e
--- 1/object/Item.php
--- 2/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,

diff --cc view/theme/vier/style.css
Simple merge