edit and preview removed from additional features and turned into core functionality (always enabled).

7 files changed, 10 insertions, 11 deletions

diff --git a/include/ItemObject.php b/include/ItemObject.php
index 6f177b606..68d037722 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -292,7 +292,7 @@ class Item extends BaseObject {
 			'share'     => $share,
 			'rawmid'	=> $item['mid'],
 			'plink'     => get_plink($item),
-			'edpost'    => ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
+			'edpost'    => true, // ((feature_enabled($conv->get_profile_owner(),'edit_posts')) ? $edpost : ''),
 			'star'      => ((feature_enabled($conv->get_profile_owner(),'star_posts')) ? $star : ''),
 			'tagger'    => ((feature_enabled($conv->get_profile_owner(),'commtag')) ? $tagger : ''),
 			'filer'     => ((feature_enabled($conv->get_profile_owner(),'filing')) ? $filer : ''),
@@ -635,7 +635,7 @@ class Item extends BaseObject {
 			'$edimg' => t('Image'),
 			'$edurl' => t('Link'),
 			'$edvideo' => t('Video'),
-			'$preview' => ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''),
+			'$preview' => true, // ((feature_enabled($conv->get_profile_owner(),'preview')) ? t('Preview') : ''),
 			'$indent' => $indent,
 			'$feature_encrypt' => ((feature_enabled($conv->get_profile_owner(),'content_encrypt')) ? true : false),
 			'$encrypt' => t('Encrypt text'),
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 = '';
 
diff --git a/include/features.php b/include/features.php
index 92d8598a5..7009b1d6b 100644
--- a/include/features.php
+++ b/include/features.php
@@ -45,7 +45,7 @@ function get_features() {
 			t('Post Composition Features'),
 //			array('richtext',       t('Richtext Editor'),			t('Enable richtext editor')),
 			array('markdown',       t('Use Markdown'),              t('Allow use of "Markdown" to format posts')),
-			array('preview',        t('Post Preview'),				t('Allow previewing posts and comments before publishing them')),
+//			array('preview',        t('Post Preview'),				t('Allow previewing posts and comments before publishing them')),
 			array('channel_sources', t('Channel Sources'),          t('Automatically import channel content from other channels or feeds')),
 			array('content_encrypt', t('Even More Encryption'),          t('Allow optional encryption of content end-to-end with a shared secret key')),
 			array('adult_photo_flagging', t('Flag Adult Photos'),   t('Provide photo edit option to hide adult photos from default album view')), 
@@ -67,7 +67,7 @@ function get_features() {
 		'tools' => array(
 			t('Post/Comment Tools'),
 //			array('multi_delete',   t('Multiple Deletion'),			t('Select and delete multiple posts/comments at once')),
-			array('edit_posts',     t('Edit Sent Posts'),			t('Edit and correct posts and comments after sending')),
+//			array('edit_posts',     t('Edit Sent Posts'),			t('Edit and correct posts and comments after sending')),
 			array('commtag',        t('Tagging'),					t('Ability to tag existing posts')),
 			array('categories',     t('Post Categories'),			t('Add categories to your posts')),
 			array('filing',         t('Saved Folders'),				t('Ability to file posts under folders')),
diff --git a/mod/editblock.php b/mod/editblock.php
index 33d4c8b1a..6ec840af7 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -170,7 +170,7 @@ function editblock_content(&$a) {
 		'$acl'                 => '', 
 		'$bang'                => '',
 		'$profile_uid'         => (intval($channel['channel_id'])),
-		'$preview'             => ((feature_enabled($uid,'preview')) ? t('Preview') : ''),
+		'$preview'             => true, // ((feature_enabled($uid,'preview')) ? t('Preview') : ''),
 		'$jotplugins'          => $jotplugins,
 		'$sourceapp'           => $itm[0]['app'],
 		'$defexpire'           => '',
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 01f439cb2..d76aa484d 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -165,7 +165,7 @@ function editlayout_content(&$a) {
 		'$acl'                 => '', 
 		'$bang'                => '',
 		'$profile_uid'         => (intval($owner)),
-		'$preview'             => ((feature_enabled($uid,'preview')) ? t('Preview') : ''),
+		'$preview'             => true, // ((feature_enabled($uid,'preview')) ? t('Preview') : ''),
 		'$jotplugins'          => $jotplugins,
 		'$sourceapp'           => t($a->sourcename),
 		'$defexpire'           => '',
diff --git a/mod/editpost.php b/mod/editpost.php
index 26e3c7139..dfbc8766e 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -137,7 +137,7 @@ function editpost_content(&$a) {
 		'$acl' => '', 
 		'$bang' => '',
 		'$profile_uid' => local_user(),
-		'$preview' => ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''),
+		'$preview' => true, // ((feature_enabled(local_user(),'preview')) ? t('Preview') : ''),
 		'$jotplugins' => $jotplugins,
 		'$sourceapp' => t($a->sourcename),
 		'$catsenabled' => $catsenabled,
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index 1b1268914..191c9a9ac 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -202,7 +202,7 @@ function editwebpage_content(&$a) {
 		'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'),
 		'$bang' => '',
 		'$profile_uid' => (intval($owner)),
-		'$preview' => ((feature_enabled($uid,'preview')) ? t('Preview') : ''),
+		'$preview' => true, // ((feature_enabled($uid,'preview')) ? t('Preview') : ''),
 		'$jotplugins' => $jotplugins,
 		'$sourceapp' => $a->sourcename,
 		'$defexpire' => '',