Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
This commit is contained in:
commit
cc63d3f8f5
3 changed files with 5 additions and 5 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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>.*?<\/title>/s", "<title>" . dol_escape_htmltag($__PAGE__TITLE__) . "</title>", $tmp);'."\n";
|
||||
$tplcontent .= '$tmp = preg_replace("/<meta name=\"title\" content=\".*?\" \/>/s", "<meta name=\"title\" content=\"" . dol_escape_htmltag($__PAGE__TITLE__) . "\" />", $tmp);';
|
||||
$tplcontent .= '$tmp = preg_replace("/<meta name=\"title\" content=\".*?\" \/>/s", "<meta name=\"title\" content=\"" . dol_string_nohtmltag($__PAGE__TITLE__) . "\" />", $tmp);';
|
||||
}
|
||||
if (strpos($objectpage->content, '$__PAGE__KEYWORDS__') !== false) {
|
||||
$tplcontent .= '$tmp = preg_replace("/<meta name=\"keywords\" content=\".*?\" \/>/s", "<meta name=\"keywords\" content=\"" . dol_escape_htmltag($__PAGE__KEYWORDS__) . "\" />", $tmp);';
|
||||
$tplcontent .= '$tmp = preg_replace("/<meta name=\"keywords\" content=\".*?\" \/>/s", "<meta name=\"keywords\" content=\"" . dol_string_nohtmltag($__PAGE__KEYWORDS__) . "\" />", $tmp);';
|
||||
}
|
||||
if (strpos($objectpage->content, '$__PAGE__DESC__') !== false) {
|
||||
$tplcontent .= '$tmp = preg_replace("/<meta name=\"description\" content=\".*?\" \/>/s", "<meta name=\"description\" content=\"" . dol_escape_htmltag($__PAGE__DESC__) . "\" />", $tmp);';
|
||||
$tplcontent .= '$tmp = preg_replace("/<meta name=\"description\" content=\".*?\" \/>/s", "<meta name=\"description\" content=\"" . dol_string_nohtmltag($__PAGE__DESC__) . "\" />", $tmp);';
|
||||
}
|
||||
$tplcontent .= 'dolWebsiteOutput($tmp, "html", '.$objectpage->id.'); dolWebsiteIncrementCounter('.$object->id.', "'.$objectpage->type_container.'", '.$objectpage->id.');'."\n";
|
||||
$tplcontent .= "// END PHP ?>\n";
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue