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

Fix warning when trying to get info of nonexistent domain

Browse source
This commit is contained in:
Kijin Sung 2017-03-13 16:15:54 +09:00
parent 8b0901b3c8
commit cbfd88dfb8
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/context/Context.class.php
View file

@ -1752,7 +1752,7 @@ class Context
} }
$site_module_info = self::get('site_module_info'); $site_module_info = self::get('site_module_info');
if ($domain !== null && $domain !== $site_module_info->domain) if ($domain !== null && $domain !== false && $domain !== $site_module_info->domain)
{ {
if (!isset($domain_infos[$domain])) if (!isset($domain_infos[$domain]))
{ {

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

@ -126,15 +126,15 @@ class moduleModel extends module
if (strpos($domain, '/') !== false) if (strpos($domain, '/') !== false)
{ {
$domain = Rhymix\Framework\URL::getDomainFromURL($domain); $domain = Rhymix\Framework\URL::getDomainFromURL($domain);
if ($domain === false)
{
return false;
}
} }
if (strpos($domain, 'xn--') !== false) if (strpos($domain, 'xn--') !== false)
{ {
$domain = Rhymix\Framework\URL::decodeIdna($domain); $domain = Rhymix\Framework\URL::decodeIdna($domain);
} }
if (strval($domain) === '')
{
return false;
}
$domain = strtolower($domain); $domain = strtolower($domain);
$domain_info = Rhymix\Framework\Cache::get('site_and_module:domain_info:domain:' . $domain); $domain_info = Rhymix\Framework\Cache::get('site_and_module:domain_info:domain:' . $domain);