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

develop

Conflicts:
	htdocs/core/lib/website.lib.php
This commit is contained in:
Laurent Destailleur 2019-07-25 13:51:12 +02:00
commit 5fd35c1bc9

View File

@ -441,7 +441,7 @@ function includeContainer($containerref)
* @param WebsitePage $websitepage Website page object
* @return string HTML content
*/
function getStructuredData($type='blogpost', WebsitePage $websitepage)
function getStructuredData($type, WebsitePage $websitepage)
{
global $conf, $db, $hookmanager, $langs, $mysoc, $user, $website, $weblangs; // Very important. Required to have var available when running inluded containers.
global $includehtmlcontentopened;