From 800eb2f444a2ea960d4dfd09d0853062c47bd974 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Tue, 18 Mar 2025 22:51:22 +0900
Subject: [PATCH] Change behavior of \@mobile directive in template v2 #2510

---
 common/framework/Template.php                          | 10 ++++++++++
 .../framework/parsers/template/TemplateParser_v2.php   |  4 ++--
 tests/_data/template/v2example.compiled.html           |  2 +-
 tests/unit/framework/parsers/TemplateParserV2Test.php  |  4 ++--
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/common/framework/Template.php b/common/framework/Template.php
index 8330aae8a..a94c8fbc6 100644
--- a/common/framework/Template.php
+++ b/common/framework/Template.php
@@ -945,6 +945,16 @@ class Template
 		return count($args) ? in_array((string)$validator_id, $args, true) : true;
 	}
 
+	/**
+	 * Check if the current visitor is using a mobile device for v2.
+	 *
+	 * @return bool
+	 */
+	protected function _v2_isMobile(): bool
+	{
+		return UA::isMobile() && (config('mobile.tablets') || !UA::isTablet());
+	}
+
 	/**
 	 * Lang shortcut for v2.
 	 *
diff --git a/common/framework/parsers/template/TemplateParser_v2.php b/common/framework/parsers/template/TemplateParser_v2.php
index b1d6c0c46..7e6d1dcbf 100644
--- a/common/framework/parsers/template/TemplateParser_v2.php
+++ b/common/framework/parsers/template/TemplateParser_v2.php
@@ -104,8 +104,8 @@ class TemplateParser_v2
 		'cannot' => ['if ($this->_v2_checkCapability(2, %s)):', 'endif;'],
 		'canany' => ['if ($this->_v2_checkCapability(3, %s)):', 'endif;'],
 		'guest' => ['if (!$this->user->isMember()):', 'endif;'],
-		'desktop' => ["if (!\\Context::get('m')):", 'endif;'],
-		'mobile' => ["if (\\Context::get('m')):", 'endif;'],
+		'desktop' => ['if (!$this->_v2_isMobile()):', 'endif;'],
+		'mobile' => ['if ($this->_v2_isMobile()):', 'endif;'],
 		'env' => ['if (!empty($_ENV[%s])):', 'endif;'],
 		'else' => ['else:'],
 		'elseif' => ['elseif (%s):'],
diff --git a/tests/_data/template/v2example.compiled.html b/tests/_data/template/v2example.compiled.html
index d4742e251..ef60e4677 100644
--- a/tests/_data/template/v2example.compiled.html
+++ b/tests/_data/template/v2example.compiled.html
@@ -42,7 +42,7 @@
 <?php (function($__filename, $__vars, $__varname, $__empty = null) { if (!$__vars): $__vars = []; if ($__empty): $__filename = $__empty; $__vars[] = ''; endif; endif; foreach ($__vars as $__var): echo $this->_v2_include("include", $__filename, [(string)$__varname => $__var]); endforeach; })('incl/eachtest', $__Context->bar, 'var'); ?>
 <?php (function($__filename, $__vars, $__varname, $__empty = null) { if (!$__vars): $__vars = []; if ($__empty): $__filename = $__empty; $__vars[] = ''; endif; endif; foreach ($__vars as $__var): echo $this->_v2_include("include", $__filename, [(string)$__varname => $__var]); endforeach; })('incl/eachtest', [], 'anything', 'incl/empty'); ?>
 
-<?php if (!\Context::get('m')): ?>
+<?php if (!$this->_v2_isMobile()): ?>
 	<p>The full class name is <?php echo htmlspecialchars(get_class(new Rhymix\Framework\Push), \ENT_QUOTES, 'UTF-8', true); ?>, <?php echo $this->config->context === 'JS' ? escape_js(Rhymix\Framework\Push::class) : htmlspecialchars(Rhymix\Framework\Push::class, \ENT_QUOTES, 'UTF-8', false); ?> really.</p>
 <?php endif; ?>
 
diff --git a/tests/unit/framework/parsers/TemplateParserV2Test.php b/tests/unit/framework/parsers/TemplateParserV2Test.php
index e6c7b0d9c..57d849151 100644
--- a/tests/unit/framework/parsers/TemplateParserV2Test.php
+++ b/tests/unit/framework/parsers/TemplateParserV2Test.php
@@ -858,10 +858,10 @@ class TemplateParserV2Test extends \Codeception\Test\Unit
 			'@endmobile',
 		]);
 		$target = implode("\n", [
-			"<?php if (!\\Context::get('m')): ?>",
+			'<?php if (!$this->_v2_isMobile()): ?>',
 			'<p>4K or GTFO!</p>',
 			'<?php endif; ?>',
-			"<?php if (\\Context::get('m')): ?>",
+			'<?php if ($this->_v2_isMobile()): ?>',
 			'<p>USB C is the way to go~</p>',
 			'<?php endif; ?>',
 		]);