lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0

Browse Source 
Conflicts:
	htdocs/core/class/html.formticket.class.php
	htdocs/takepos/admin/setup.php
This commit is contained in:
Laurent Destailleur 2020-06-11 23:36:55 +02:00
commit 2109a91992
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
htdocs/core/class/html.formticket.class.php
View File

@ -987,10 +987,10 @@ class FormTicket
} }
// MESSAGE // MESSAGE
$defaultmessage = ""; $defaultmessage="";
if (is_array($arraydefaultmessage) && count($arraydefaultmessage) > 0 && $arraydefaultmessage->content) { if (is_object($arraydefaultmessage) && $arraydefaultmessage->content) {
$defaultmessage = $arraydefaultmessage->content; $defaultmessage = $arraydefaultmessage->content;
} }
$defaultmessage = str_replace('\n', "\n", $defaultmessage); $defaultmessage = str_replace('\n', "\n", $defaultmessage);
// Deal with format differences between message and signature (text / HTML) // Deal with format differences between message and signature (text / HTML)

2
htdocs/core/modules/modContrat.class.php
View File

@ -214,7 +214,7 @@ class modContrat extends DolibarrModules
*/ */
public function init($options = '') public function init($options = '')
{ {
global $conf; global $conf, $langs;
// Nettoyage avant activation // Nettoyage avant activation
$this->remove($options); $this->remove($options);