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

Qual: Code cleaning

Browse Source
This commit is contained in:
Laurent Destailleur
2011-12-04 22:49:54 +01:00
parent e6f3599847
commit dd0debb718
5 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/conf.class.php
View File

@@ -343,8 +343,6 @@ class Conf
$this->mailing->email_from=$this->email_from;
if (! empty($this->global->MAILING_EMAIL_FROM)) $this->mailing->email_from=$this->global->MAILING_EMAIL_FROM;
if (! isset($this->global->FCKEDITOR_EDITORNAME)) $this->global->FCKEDITOR_EDITORNAME='ckeditor'; // fckeditor to switch
// Format for date (used by default when not found or searched in lang)
$this->format_date_short="%d/%m/%Y"; // Format of day with PHP/C tags (strftime functions)
$this->format_date_short_java="dd/MM/yyyy"; // Format of day with Java tags

5
htdocs/core/class/doleditor.class.php
View File

@@ -139,14 +139,15 @@ class DolEditor
* Output edit area inside the HTML stream.
* Output depends on this->tool (fckeditor, ckeditor, texatrea, ...)
*
* @param noprint 1=Return HTML string instead of printing it to output
* @param int $noprint 1=Return HTML string instead of printing it to output
* @return void
*/
function Create($noprint=0)
{
global $conf;
$found=0;
$out='';
$out='';
if ($this->tool == 'fckeditor')
{