From 5b492110354f8cd647f03999de56f9f1643bcfd6 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 16 Dec 2014 14:28:07 -0800 Subject: edit and preview removed from additional features and turned into core functionality (always enabled). --- include/conversation.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'include/conversation.php') diff --git a/include/conversation.php b/include/conversation.php index b9419acde..7ce67e694 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -666,7 +666,6 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $ $body = prepare_body($item,true); - //$tmp_item = replace_macros($tpl,array( $tmp_item = array( 'template' => $tpl, 'toplevel' => 'toplevel_item', @@ -1100,8 +1099,8 @@ function status_editor($a,$x,$popup=false) { $jotplugins = ''; $jotnets = ''; - - $preview = ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''); + $preview = true; +// $preview = ((feature_enabled($x['profile_uid'],'preview')) ? t('Preview') : ''); if(x($x,'nopreview')) $preview = ''; -- cgit v1.2.3