From 43dedcb2b1e7b00e208f6b00da1a47ebbb52bd67 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 1 Jun 2022 22:29:29 +0200 Subject: [PATCH] # WARNING: head commit changed in the meantime Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop --- htdocs/core/lib/functions.lib.php | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php index 9aad4efb3dd..a82827c30ee 100644 --- a/htdocs/core/lib/functions.lib.php +++ b/htdocs/core/lib/functions.lib.php @@ -3029,10 +3029,19 @@ function dol_print_socialnetworks($value, $cid, $socid, $type, $dictsocialnetwor if (!empty($dictsocialnetworks[$type]['url'])) { $tmpvirginurl = preg_replace('/\/?{socialid}/', '', $dictsocialnetworks[$type]['url']); if ($tmpvirginurl) { - $value = preg_replace('/'.preg_quote($tmpvirginurl, '/').'\/?/', '', $value); + $value = preg_replace('/^www\.'.preg_quote($tmpvirginurl, '/').'\/?/', '', $value); + $value = preg_replace('/^'.preg_quote($tmpvirginurl, '/').'\/?/', '', $value); + + $tmpvirginurl3 = preg_replace('/^https:\/\//i', 'https://www.', $tmpvirginurl); + if ($tmpvirginurl3) { + $value = preg_replace('/^www\.'.preg_quote($tmpvirginurl3, '/').'\/?/', '', $value); + $value = preg_replace('/^'.preg_quote($tmpvirginurl3, '/').'\/?/', '', $value); + } + $tmpvirginurl2 = preg_replace('/^https?:\/\//i', '', $tmpvirginurl); if ($tmpvirginurl2) { - $value = preg_replace('/'.preg_quote($tmpvirginurl2, '/').'\/?/', '', $value); + $value = preg_replace('/^www\.'.preg_quote($tmpvirginurl2, '/').'\/?/', '', $value); + $value = preg_replace('/^'.preg_quote($tmpvirginurl2, '/').'\/?/', '', $value); } } $link = str_replace('{socialid}', $value, $dictsocialnetworks[$type]['url']);