diff options
| author | friendica <info@friendica.com> | 2014-12-16 14:28:07 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-12-16 14:28:07 -0800 |
| commit | 5b492110354f8cd647f03999de56f9f1643bcfd6 (patch) | |
| tree | 1e6d0673db3c3a923d4bbbbea318049558bb1a94 /include/conversation.php | |
| parent | 7bee4e5997804658f508a32d07ca4143d8afe629 (diff) | |
| download | volse-hubzilla-5b492110354f8cd647f03999de56f9f1643bcfd6.tar.gz volse-hubzilla-5b492110354f8cd647f03999de56f9f1643bcfd6.tar.bz2 volse-hubzilla-5b492110354f8cd647f03999de56f9f1643bcfd6.zip | |
edit and preview removed from additional features and turned into core functionality (always enabled).
Diffstat (limited to 'include/conversation.php')
| -rw-r--r-- | include/conversation.php | 5 |
1 files changed, 2 insertions, 3 deletions
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 = ''; |