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

Merge branch '18.0' of git@github.com:Dolibarr/dolibarr.git into 19.0

Browse Source 
Conflicts:
	htdocs/core/triggers/interface_50_modTicket_TicketEmail.class.php
	htdocs/public/ticket/create_ticket.php
	htdocs/public/ticket/index.php
	htdocs/public/ticket/list.php
	htdocs/public/ticket/view.php
	htdocs/ticket/agenda.php
	htdocs/ticket/card.php
	htdocs/ticket/class/ticket.class.php
	htdocs/ticket/contact.php
	htdocs/ticket/document.php
	htdocs/ticket/index.php
	htdocs/ticket/list.php
	htdocs/ticket/messaging.php
	htdocs/ticket/stats/index.php
This commit is contained in:
Laurent Destailleur
2024-03-20 02:25:58 +01:00
parent 0584754c5c a7223719a5
commit dd5d70ad5d
17 changed files with 318 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/lib/ticket.lib.php
View File

@@ -162,7 +162,7 @@ function showDirectPublicLink($object)
$email = CMailFile::getValidAddress($object->origin_email, 2);
$url = '';
if ($email) {
$url = dol_buildpath('/public/ticket/view.php', 3).'?track_id='.$object->track_id.'&email='.$email;
$url = getDolGlobalString('TICKET_URL_PUBLIC_INTERFACE', dol_buildpath('/public/ticket/', 3)).'view.php?track_id='.$object->track_id.'&email='.$email;
}
$out = '';