mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-04-02 01:52:10 +09:00
Merge branch 'rhymix:master' into master
This commit is contained in:
commit
bbd62dbea3
8 changed files with 85 additions and 26 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue