Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-19 23:55:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

rule of snakes #1, kill the snake.

Browse source 
tinymce is gone. if you want a visual editor, figure out what you want and make it happen.
If you don't want a visual editor, do nothing.
This is in the community's hands. I don't need a visual editor.
This commit is contained in:
friendica 2014-06-28 05:05:34 -07:00
parent 532b6f7fce
commit 0074ef0bf3
11 changed files with 528 additions and 465 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/conversation.php
View file

@ -1029,8 +1029,8 @@ function status_editor($a,$x,$popup=false) {
$plaintext = true;
if(feature_enabled(local_user(),'richtext'))
$plaintext = false;
// if(feature_enabled(local_user(),'richtext'))
// $plaintext = false;
$mimeselect = '';
if(array_key_exists('mimetype',$x) && $x['mimetype']) {

4
mod/editblock.php
View file

@ -58,8 +58,8 @@ function editblock_content(&$a) {
$plaintext = true;
// You may or may not be a local user.
if(local_user() && feature_enabled(local_user(),'richtext'))
$plaintext = false;
// if(local_user() && feature_enabled(local_user(),'richtext'))
// $plaintext = false;
$mimeselect = '';
$mimetype = $itm[0]['mimetype'];

4
mod/editlayout.php
View file

@ -65,8 +65,8 @@ function editlayout_content(&$a) {
$plaintext = true;
// You may or may not be a local user. This won't work,
if(feature_enabled(local_user(),'richtext'))
$plaintext = false;
// if(feature_enabled(local_user(),'richtext'))
// $plaintext = false;
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
'$title' => t('Edit Layout')

4
mod/editwebpage.php
View file

@ -73,8 +73,8 @@ function editwebpage_content(&$a) {
$plaintext = true;
if(feature_enabled($itm[0]['uid'],'richtext'))
$plaintext = false;
// if(feature_enabled($itm[0]['uid'],'richtext'))
// $plaintext = false;
$mimetype = $itm[0]['mimetype'];

4
mod/events.php
View file

@ -161,8 +161,8 @@ function events_content(&$a) {
$plaintext = true;
if(feature_enabled(local_user(),'richtext'))
$plaintext = false;
// if(feature_enabled(local_user(),'richtext'))
// $plaintext = false;

12
mod/item.php
View file

@ -430,10 +430,14 @@ function item_post(&$a) {
// First figure out if it's a status post that would've been
// created using tinymce. Otherwise leave it alone.
$plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true);
if((! $parent) && (! $api_source) && (! $plaintext)) {
$body = fix_mce_lf($body);
}
$plaintext = true;
// $plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true);
// if((! $parent) && (! $api_source) && (! $plaintext)) {
// $body = fix_mce_lf($body);
// }
// If we're sending a private top-level message with a single @-taggable channel as a recipient, @-tag it, if our pconfig is set.

17
mod/mail.php
View file

@ -76,9 +76,9 @@ function mail_post(&$a) {
}
}
if(feature_enabled(local_user(),'richtext')) {
$body = fix_mce_lf($body);
}
// if(feature_enabled(local_user(),'richtext')) {
// $body = fix_mce_lf($body);
// }
if(! $recipient) {
notice('No recipient found.');
@ -156,11 +156,7 @@ function mail_content(&$a) {
$o .= $header;
$plaintext = false;
if(intval(get_pconfig(local_user(),'system','plaintext')))
$plaintext = true;
if(! feature_enabled(local_user(),'richtext'))
$plaintext = true;
$plaintext = true;
$tpl = get_markup_template('msg-header.tpl');
@ -240,8 +236,9 @@ function mail_content(&$a) {
$o .= $header;
$plaintext = true;
if( local_user() && feature_enabled(local_user(),'richtext') )
$plaintext = false;
// if( local_user() && feature_enabled(local_user(),'richtext') )
// $plaintext = false;
$messages = private_messages_fetch_conversation(local_user(), argv(1), true);

4
mod/profiles.php
View file

@ -477,8 +477,8 @@ function profiles_content(&$a) {
$editselect = 'none';
if(feature_enabled(local_user(),'richtext'))
$editselect = 'textareas';
// if(feature_enabled(local_user(),'richtext'))
// $editselect = 'textareas';
$a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
'$baseurl' => $a->get_baseurl(true),

4
mod/rpost.php
View file

@ -83,8 +83,8 @@ function rpost_content(&$a) {
}
$plaintext = true;
if(feature_enabled(local_user(),'richtext'))
$plaintext = false;
// if(feature_enabled(local_user(),'richtext'))
// $plaintext = false;
if(array_key_exists('type', $_REQUEST) && $_REQUEST['type'] === 'html') {
require_once('include/html2bbcode.php');

934
util/messages.po
View file

File diff suppressed because it is too large Load diff

2
version.inc
View file

@ -1 +1 @@
2014-06-26.718
2014-06-28.720