Merge branch 'rhymix:master' into master

This commit is contained in:
Lastorder 2026-02-06 09:51:56 +09:00 committed by GitHub
commit bbd62dbea3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
8 changed files with 85 additions and 26 deletions

View file

@ -380,7 +380,7 @@ class Session
self::$_autologin_key = self::_getAutologinKey();
if (!$member_srl && self::$_autologin_key)
{
$member_srl = \MemberController::getInstance()->doAutologin(self::$_autologin_key);
$member_srl = \MemberController::doAutoLogin(self::$_autologin_key);
if ($member_srl && self::isValid($member_srl))
{
self::login($member_srl, false);

View file

@ -528,7 +528,7 @@ class Template
*/
public function isRelativePath(string $path): bool
{
return !preg_match('#^((?:https?|file|data):|[\/\{<])#i', $path);
return !preg_match('#^((?:https?|file|data):|[\/\{\\\\<$\#@]|&\#x1B;)#i', $path);
}
/**