diff --git a/htdocs/core/class/html.formticket.class.php b/htdocs/core/class/html.formticket.class.php
index 0ac53cbde82..19068eba161 100644
--- a/htdocs/core/class/html.formticket.class.php
+++ b/htdocs/core/class/html.formticket.class.php
@@ -698,7 +698,7 @@ class FormTicket
}
}
- if ($subelement != 'contract') {
+ if ($subelement != 'contract' && $subelement != 'contrat') {
if (isModEnabled('contract') && !$this->ispublic) {
$langs->load('contracts');
$formcontract = new FormContract($this->db);
diff --git a/htdocs/core/lib/website2.lib.php b/htdocs/core/lib/website2.lib.php
index 2e2eb0371fb..8ed23b7d88b 100644
--- a/htdocs/core/lib/website2.lib.php
+++ b/htdocs/core/lib/website2.lib.php
@@ -279,13 +279,13 @@ function dolSavePageContent($filetpl, Website $object, WebsitePage $objectpage,
$tplcontent .= '$tmp = ob_get_contents(); ob_end_clean();'."\n";
if (strpos($objectpage->content, '$__PAGE__TITLE__') !== false) {
$tplcontent .= '$tmp = preg_replace("/
.*?<\/title>/s", "" . dol_escape_htmltag($__PAGE__TITLE__) . "", $tmp);'."\n";
- $tplcontent .= '$tmp = preg_replace("//s", "", $tmp);';
+ $tplcontent .= '$tmp = preg_replace("//s", "", $tmp);';
}
if (strpos($objectpage->content, '$__PAGE__KEYWORDS__') !== false) {
- $tplcontent .= '$tmp = preg_replace("//s", "", $tmp);';
+ $tplcontent .= '$tmp = preg_replace("//s", "", $tmp);';
}
if (strpos($objectpage->content, '$__PAGE__DESC__') !== false) {
- $tplcontent .= '$tmp = preg_replace("//s", "", $tmp);';
+ $tplcontent .= '$tmp = preg_replace("//s", "", $tmp);';
}
$tplcontent .= 'dolWebsiteOutput($tmp, "html", '.$objectpage->id.'); dolWebsiteIncrementCounter('.$object->id.', "'.$objectpage->type_container.'", '.$objectpage->id.');'."\n";
$tplcontent .= "// END PHP ?>\n";
diff --git a/htdocs/ticket/card.php b/htdocs/ticket/card.php
index e15d047d30f..a239c3f2bb6 100644
--- a/htdocs/ticket/card.php
+++ b/htdocs/ticket/card.php
@@ -249,7 +249,7 @@ if (empty($reshook)) {
$object->fk_soc = GETPOSTINT('socid');
$fk_user_assign = GETPOSTINT('fk_user_assign');
$object->fk_project = GETPOSTINT('projectid');
- $object->fk_contract = GETPOSTINT('fk_contract');
+ $object->fk_contract = GETPOSTISSET('contractid') ? GETPOSTINT('contractid') : GETPOSTINT('contratid');
if ($fk_user_assign > 0) {
$object->fk_user_assign = $fk_user_assign;