Merge remote-tracking branch 'upstream/master'

This commit is contained in:
djmaze 2020-07-13 11:40:49 +02:00
commit 85155a9895
17 changed files with 286 additions and 245 deletions

View file

@ -138,7 +138,8 @@ class Service
{
$bMobile = false;
$bMobileDevice = false;
if ($this->oActions->Config()->Get('labs', 'allow_mobile_version', false)) {
if ($this->oActions->Config()->Get('labs', 'allow_mobile_version', false))
{
$bUseMobileVersionForTablets = $this->oActions->Config()->Get('labs', 'use_mobile_version_for_tablets', false);
$bMobileDevice = UserAgent::isMobile() &&
($bUseMobileVersionForTablets ? true : !UserAgent::isTablet());