mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 02:35:12 +00:00
rule of snakes #1, kill the snake.
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:
parent
532b6f7fce
commit
0074ef0bf3
11 changed files with 528 additions and 465 deletions
|
@ -1029,8 +1029,8 @@ function status_editor($a,$x,$popup=false) {
|
||||||
|
|
||||||
$plaintext = true;
|
$plaintext = true;
|
||||||
|
|
||||||
if(feature_enabled(local_user(),'richtext'))
|
// if(feature_enabled(local_user(),'richtext'))
|
||||||
$plaintext = false;
|
// $plaintext = false;
|
||||||
|
|
||||||
$mimeselect = '';
|
$mimeselect = '';
|
||||||
if(array_key_exists('mimetype',$x) && $x['mimetype']) {
|
if(array_key_exists('mimetype',$x) && $x['mimetype']) {
|
||||||
|
|
|
@ -58,8 +58,8 @@ function editblock_content(&$a) {
|
||||||
$plaintext = true;
|
$plaintext = true;
|
||||||
|
|
||||||
// You may or may not be a local user.
|
// You may or may not be a local user.
|
||||||
if(local_user() && feature_enabled(local_user(),'richtext'))
|
// if(local_user() && feature_enabled(local_user(),'richtext'))
|
||||||
$plaintext = false;
|
// $plaintext = false;
|
||||||
|
|
||||||
$mimeselect = '';
|
$mimeselect = '';
|
||||||
$mimetype = $itm[0]['mimetype'];
|
$mimetype = $itm[0]['mimetype'];
|
||||||
|
|
|
@ -65,8 +65,8 @@ function editlayout_content(&$a) {
|
||||||
|
|
||||||
$plaintext = true;
|
$plaintext = true;
|
||||||
// You may or may not be a local user. This won't work,
|
// You may or may not be a local user. This won't work,
|
||||||
if(feature_enabled(local_user(),'richtext'))
|
// if(feature_enabled(local_user(),'richtext'))
|
||||||
$plaintext = false;
|
// $plaintext = false;
|
||||||
|
|
||||||
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
$o .= replace_macros(get_markup_template('edpost_head.tpl'), array(
|
||||||
'$title' => t('Edit Layout')
|
'$title' => t('Edit Layout')
|
||||||
|
|
|
@ -73,8 +73,8 @@ function editwebpage_content(&$a) {
|
||||||
|
|
||||||
$plaintext = true;
|
$plaintext = true;
|
||||||
|
|
||||||
if(feature_enabled($itm[0]['uid'],'richtext'))
|
// if(feature_enabled($itm[0]['uid'],'richtext'))
|
||||||
$plaintext = false;
|
// $plaintext = false;
|
||||||
|
|
||||||
$mimetype = $itm[0]['mimetype'];
|
$mimetype = $itm[0]['mimetype'];
|
||||||
|
|
||||||
|
|
|
@ -161,8 +161,8 @@ function events_content(&$a) {
|
||||||
|
|
||||||
$plaintext = true;
|
$plaintext = true;
|
||||||
|
|
||||||
if(feature_enabled(local_user(),'richtext'))
|
// if(feature_enabled(local_user(),'richtext'))
|
||||||
$plaintext = false;
|
// $plaintext = false;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
12
mod/item.php
12
mod/item.php
|
@ -430,10 +430,14 @@ function item_post(&$a) {
|
||||||
// First figure out if it's a status post that would've been
|
// First figure out if it's a status post that would've been
|
||||||
// created using tinymce. Otherwise leave it alone.
|
// created using tinymce. Otherwise leave it alone.
|
||||||
|
|
||||||
$plaintext = ((feature_enabled($profile_uid,'richtext')) ? false : true);
|
$plaintext = true;
|
||||||
if((! $parent) && (! $api_source) && (! $plaintext)) {
|
|
||||||
$body = fix_mce_lf($body);
|
// $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.
|
// 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
17
mod/mail.php
|
@ -76,9 +76,9 @@ function mail_post(&$a) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(feature_enabled(local_user(),'richtext')) {
|
// if(feature_enabled(local_user(),'richtext')) {
|
||||||
$body = fix_mce_lf($body);
|
// $body = fix_mce_lf($body);
|
||||||
}
|
// }
|
||||||
|
|
||||||
if(! $recipient) {
|
if(! $recipient) {
|
||||||
notice('No recipient found.');
|
notice('No recipient found.');
|
||||||
|
@ -156,11 +156,7 @@ function mail_content(&$a) {
|
||||||
|
|
||||||
$o .= $header;
|
$o .= $header;
|
||||||
|
|
||||||
$plaintext = false;
|
$plaintext = true;
|
||||||
if(intval(get_pconfig(local_user(),'system','plaintext')))
|
|
||||||
$plaintext = true;
|
|
||||||
if(! feature_enabled(local_user(),'richtext'))
|
|
||||||
$plaintext = true;
|
|
||||||
|
|
||||||
$tpl = get_markup_template('msg-header.tpl');
|
$tpl = get_markup_template('msg-header.tpl');
|
||||||
|
|
||||||
|
@ -240,8 +236,9 @@ function mail_content(&$a) {
|
||||||
$o .= $header;
|
$o .= $header;
|
||||||
|
|
||||||
$plaintext = true;
|
$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);
|
$messages = private_messages_fetch_conversation(local_user(), argv(1), true);
|
||||||
|
|
||||||
|
|
|
@ -477,8 +477,8 @@ function profiles_content(&$a) {
|
||||||
|
|
||||||
|
|
||||||
$editselect = 'none';
|
$editselect = 'none';
|
||||||
if(feature_enabled(local_user(),'richtext'))
|
// if(feature_enabled(local_user(),'richtext'))
|
||||||
$editselect = 'textareas';
|
// $editselect = 'textareas';
|
||||||
|
|
||||||
$a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
|
$a->page['htmlhead'] .= replace_macros(get_markup_template('profed_head.tpl'), array(
|
||||||
'$baseurl' => $a->get_baseurl(true),
|
'$baseurl' => $a->get_baseurl(true),
|
||||||
|
|
|
@ -83,8 +83,8 @@ function rpost_content(&$a) {
|
||||||
}
|
}
|
||||||
|
|
||||||
$plaintext = true;
|
$plaintext = true;
|
||||||
if(feature_enabled(local_user(),'richtext'))
|
// if(feature_enabled(local_user(),'richtext'))
|
||||||
$plaintext = false;
|
// $plaintext = false;
|
||||||
|
|
||||||
if(array_key_exists('type', $_REQUEST) && $_REQUEST['type'] === 'html') {
|
if(array_key_exists('type', $_REQUEST) && $_REQUEST['type'] === 'html') {
|
||||||
require_once('include/html2bbcode.php');
|
require_once('include/html2bbcode.php');
|
||||||
|
|
934
util/messages.po
934
util/messages.po
File diff suppressed because it is too large
Load diff
|
@ -1 +1 @@
|
||||||
2014-06-26.718
|
2014-06-28.720
|
||||||
|
|
Loading…
Reference in a new issue