From 2752b58f3323a15b964f6518b7720cb81ccf1b0e Mon Sep 17 00:00:00 2001
From: friendica <info@friendica.com>
Date: Mon, 5 Nov 2012 01:25:08 -0800
Subject: plaintext default - richtext is a feature

---
 include/api.php          | 10 +++++-----
 include/conversation.php |  6 +++---
 include/features.php     |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'include')

diff --git a/include/api.php b/include/api.php
index 428c17957..ec3e9404a 100644
--- a/include/api.php
+++ b/include/api.php
@@ -480,8 +480,8 @@
 		return null;
 	}
 
-/*Waitman Gobble Mod*/
-        function api_statuses_mediap(&$a, $type) {
+
+    function api_statuses_mediap(&$a, $type) {
                 if (local_user()===false) {
                         logger('api_statuses_update: no user');
                         return false;
@@ -508,7 +508,7 @@
 		
                 $a->argv[1]=$user_info['screen_name']; //should be set to username?
 		
-		$_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
+		$_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo
                 require_once('mod/wall_upload.php');
 		$bebop = wall_upload_post($a);
                 
@@ -521,7 +521,7 @@
                 return api_status_show($a,$type);
         }
         api_register_func('api/statuses/mediap','api_statuses_mediap', true);
-/*Waitman Gobble Mod*/
+
 
 
 	function api_statuses_update(&$a, $type) {
@@ -575,7 +575,7 @@
 			$_REQUEST['type'] = 'wall';
 			if(x($_FILES,'media')) {
 				// upload the image if we have one
-				$_REQUEST['hush']='yeah'; //tell wall_upload function to return img info instead of echo
+				$_REQUEST['silent']='1'; //tell wall_upload function to return img info instead of echo
 				require_once('mod/wall_upload.php');
 				$media = wall_upload_post($a);
 				if(strlen($media)>0)
diff --git a/include/conversation.php b/include/conversation.php
index e9e550a12..532fe0ba1 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1661,9 +1661,9 @@ function status_editor($a,$x,$popup=false) {
 
 	$geotag = (($x['allow_location']) ? get_markup_template('jot_geotag.tpl') : '');
 
-	$plaintext = false;
-	if(local_user() && intval(get_pconfig(local_user(),'system','plaintext')))
-		$plaintext = true;
+	$plaintext = true;
+	if(feature_enabled(local_user(),'richtext'))
+		$plaintext = false;
 
 	$tpl = get_markup_template('jot-header.tpl');
 	
diff --git a/include/features.php b/include/features.php
index efd9c3455..dfed4ad02 100644
--- a/include/features.php
+++ b/include/features.php
@@ -26,7 +26,7 @@ array('dislike',      t('Dislike Posts'),      t('Ability to dislike posts/comme
 array('savedsearch',  t('Saved Searches'),     t('Save search terms for re-use')),
 array('preview',      t('Post Preview'),       t('Preview posts and comments before publishing them')),
 array('edit_posts',   t('Edit Sent Posts'),    t('Edit/correct posts and comments after sending')),
-
+array('richtext',     t('Richtext Editor'),    t('Use richtext/visual editor where applicable')),
 );
 
 	call_hooks('get_features',$arr);
-- 
cgit v1.2.3