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

Fix $weblangs must be initialized with language of page

Browse Source
This commit is contained in:
Laurent Destailleur 2020-05-08 14:25:49 +02:00
parent c98663be4a
commit 0138ab3f7c
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
htdocs/core/website.inc.php
View File

@ -33,11 +33,6 @@ if (!is_object($website))
$website = new Website($db); $website = new Website($db);
$website->fetch(0, $websitekey); $website->fetch(0, $websitekey);
} }
// Define $weblangs
if (!is_object($weblangs))
{
$weblangs = dol_clone($langs); // TODO Use an object lang from a language set into $website object instead of backoffice
}
// Define $websitepage if we have $websitepagefile defined // Define $websitepage if we have $websitepagefile defined
if (!$pageid && !empty($websitepagefile)) if (!$pageid && !empty($websitepagefile))
{ {
@ -48,10 +43,17 @@ if (!is_object($websitepage))
{ {
$websitepage = new WebsitePage($db); $websitepage = new WebsitePage($db);
} }
// Define $weblangs
if (!is_object($weblangs))
{
$weblangs = new Translate($db);
}
if ($pageid > 0) if ($pageid > 0)
{ {
$websitepage->fetch($pageid); $websitepage->fetch($pageid);
$weblangs->setDefaultLang($websitepage->lang ? $websitepage->lang : 'auto');
if (!defined('USEDOLIBARREDITOR') && in_array($websitepage->type_container, array('menu', 'other'))) if (!defined('USEDOLIBARREDITOR') && in_array($websitepage->type_container, array('menu', 'other')))
{ {
$weblangs->load("website"); $weblangs->load("website");