From 677a5f2e352432d8da0f7367514349751c43063c Mon Sep 17 00:00:00 2001
From: RainLoop <support@rainloop.net>
Date: Fri, 22 Sep 2017 19:41:40 +0300
Subject: [PATCH] Add labs.use_mobile_version_for_tablets setting in
 applicxation.ini (#1507)

---
 .../v/0.0.0/app/libraries/RainLoop/Config/Application.php    | 1 +
 rainloop/v/0.0.0/app/libraries/RainLoop/Service.php          | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
index 0a80d4227..f32bc6bdd 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Config/Application.php
@@ -395,6 +395,7 @@ Enables caching in the system'),
 				'try_to_detect_hidden_images' => array(false),
 				'hide_dangerous_actions' => array(false),
 				'use_app_debug_js' => array(false),
+				'use_mobile_version_for_tablets' => array(false),
 				'use_app_debug_css' => array(false),
 				'use_imap_sort' => array(true),
 				'use_imap_force_selection' => array(false),
diff --git a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
index 5a8bd760b..56e0e57e2 100644
--- a/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
+++ b/rainloop/v/0.0.0/app/libraries/RainLoop/Service.php
@@ -156,8 +156,11 @@ class Service
 
 		if ($this->oActions->Config()->Get('labs', 'allow_mobile_version', false))
 		{
+			$bUseMobileVersionForTablets = $this->oActions->Config()->Get('labs', 'use_mobile_version_for_tablets', false);
+
 			$oMobileDetect = new \Detection\MobileDetect();
-			$bMobileDevice = $oMobileDetect->isMobile() && !$oMobileDetect->isTablet();
+			$bMobileDevice = $oMobileDetect->isMobile() &&
+				($bUseMobileVersionForTablets ? true : !$oMobileDetect->isTablet());
 
 			$bMobile = (0 < \count($aPaths) && !empty($aPaths[0]) && 'mobile' === \strtolower($aPaths[0]));
 		}