fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-09 03:52:15 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix fatal error in CLI scripts in PHP 8.4 #2513

Browse source
This commit is contained in:
Kijin Sung 2025-03-05 18:48:34 +09:00
parent 5656189a19
commit fed2af3d13
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
common/framework/URL.php
View file

@ -258,7 +258,12 @@ class URL
$position = 0; $position = 0;
} }
if (function_exists('idn_to_utf8')) $domain = (string)$domain;
if ($domain === '')
{
$new_domain = '';
}
elseif (function_exists('idn_to_utf8'))
{ {
$new_domain = idn_to_utf8($domain); $new_domain = idn_to_utf8($domain);
} }

4
modules/module/module.model.php
View file

@ -195,13 +195,13 @@ class ModuleModel extends Module
/** /**
* @brief Get the default mid according to the domain * @brief Get the default mid according to the domain
*/ */
public static function getDefaultMid($domain = null) public static function getDefaultMid($domain = '')
{ {
// Get current domain. // Get current domain.
$domain = $domain ? Rhymix\Framework\URL::decodeIdna($domain) : Rhymix\Framework\URL::getCurrentDomain(); $domain = $domain ? Rhymix\Framework\URL::decodeIdna($domain) : Rhymix\Framework\URL::getCurrentDomain();
// Find the domain information. // Find the domain information.
$domain_info = self::getSiteInfoByDomain($domain); $domain_info = $domain ? self::getSiteInfoByDomain($domain) : null;
if (!$domain_info) if (!$domain_info)
{ {
$domain_info = self::getDefaultDomainInfo(); $domain_info = self::getDefaultDomainInfo();