Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

FIX Option FCKEDITOR_ENABLE_MAIL was no used into dictionnary page to

Browse Source 
edit email templates
This commit is contained in:
Laurent Destailleur
2016-03-05 12:37:09 +01:00
parent 446a080c75
commit d8045e33bb
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/admin/dict.php
View File

@@ -1593,7 +1593,9 @@ function fieldList($fieldlist, $obj='', $tabname='', $context='')
if ($context != 'hide') if ($context != 'hide')
{ {
//print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>'; //print '<textarea cols="3" rows="'.ROWS_2.'" class="flat" name="'.$fieldlist[$field].'">'.(! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:'').'</textarea>';
$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, true, ROWS_5, '90%'); $okforextended=true;
if ($tabname == MAIN_DB_PREFIX.'c_email_templates' && empty($conf->global->FCKEDITOR_ENABLE_MAIL)) $okforextended=false;
$doleditor = new DolEditor($fieldlist[$field], (! empty($obj->{$fieldlist[$field]})?$obj->{$fieldlist[$field]}:''), '', 140, 'dolibarr_mailings', 'In', 0, false, $okforextended, ROWS_5, '90%');
print $doleditor->Create(1); print $doleditor->Create(1);
} }
else print '&nbsp;'; else print '&nbsp;';

2
htdocs/core/class/html.formmail.class.php
View File

@@ -952,7 +952,7 @@ class FormMail extends Form
'__PROJECT_REF__', '__PROJECT_REF__',
'__PROJECT_NAME__', '__PROJECT_NAME__',
'__CONTACTCIVNAME__', '__CONTACTCIVNAME__',
'__PERSONALIZED__', // Paypal link is added here '__PERSONALIZED__', // Paypal link will be added here in form mode
'__SIGNATURE__', '__SIGNATURE__',
); );
} }