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

Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2020-06-06 20:25:24 +02:00
commit 148bdec96f
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
htdocs/website/class/website.class.php
View File

@ -1455,6 +1455,7 @@ class Website extends CommonObject
$url = preg_replace('/(\?|&)l=([a-zA-Z_]*)/', '', $url); // We remove param l from url $url = preg_replace('/(\?|&)l=([a-zA-Z_]*)/', '', $url); // We remove param l from url
//$url = preg_replace('/(\?|&)lang=([a-zA-Z_]*)/', '', $url); // We remove param lang from url //$url = preg_replace('/(\?|&)lang=([a-zA-Z_]*)/', '', $url); // We remove param lang from url
$url .= (preg_match('/\?/', $url) ? '&' : '?').'l='; $url .= (preg_match('/\?/', $url) ? '&' : '?').'l=';
if (! preg_match('/^\//', $url)) $url = '/'.$url;
$HEIGHTOPTION = 40; $HEIGHTOPTION = 40;
$MAXHEIGHT = 4 * $HEIGHTOPTION; $MAXHEIGHT = 4 * $HEIGHTOPTION;