aboutsummaryrefslogtreecommitdiffstats
path: root/include/conversation.php
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2012-02-14 23:13:18 -0800
committerfriendica <info@friendica.com>2012-02-14 23:13:18 -0800
commit03171fd7deeb8e564478273ebdbee77eeab4a6cd (patch)
tree1eff806720631bcbaf0a119444c9fd1731d37b0b /include/conversation.php
parentf86593965389e2592ae41c7e7f5cb6dcfc7a660f (diff)
downloadvolse-hubzilla-03171fd7deeb8e564478273ebdbee77eeab4a6cd.tar.gz
volse-hubzilla-03171fd7deeb8e564478273ebdbee77eeab4a6cd.tar.bz2
volse-hubzilla-03171fd7deeb8e564478273ebdbee77eeab4a6cd.zip
preliminary qcomment support, [nosmile] tag to disable smiley processing
Diffstat (limited to 'include/conversation.php')
-rwxr-xr-xinclude/conversation.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 8a0fd00fb..2ea9b603f 100755
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -522,6 +522,9 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
if ($shareable) $likebuttons['share'] = array( t('Share this'), t('share'));
}
+// $qcomment = array(':-)','LOL','ROTFL','[smile]');
+ $qcomment = null;
+
if(($show_comment_box) || (($show_comment_box == false) && ($override_comment_box == false) && ($item['last-child']))) {
$comment = replace_macros($cmnt_tpl,array(
'$return_path' => '',
@@ -529,6 +532,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
'$type' => (($mode === 'profile') ? 'wall-comment' : 'net-comment'),
'$id' => $item['item_id'],
'$parent' => $item['parent'],
+ '$qcomment' => $qcomment,
'$profile_uid' => $profile_owner,
'$mylink' => $a->contact['url'],
'$mytitle' => t('This is you'),
@@ -634,7 +638,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
// Build the HTML
$body = prepare_body($item,true);
-
$tmp_item = replace_macros($template,array(
'$type' => implode("",array_slice(split("/",$item['verb']),-1)),