fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-01-07 18:51:41 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix potential type error in editor component XML handling logic

Browse source
This commit is contained in:
Kijin Sung 2023-10-03 16:18:56 +09:00
parent db4e874660
commit df6fdd3bc3
2 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/framework/parsers/EditorComponentParser.php
View file

@ -13,15 +13,15 @@ class EditorComponentParser extends BaseParser
* @param string $filename * @param string $filename
* @param string $component_name * @param string $component_name
* @param string $lang * @param string $lang
* @return object|false * @return ?object
*/ */
public static function loadXML(string $filename, string $component_name, string $lang = '') public static function loadXML(string $filename, string $component_name, string $lang = ''): ?object
{ {
// Load the XML file. // Load the XML file.
$xml = simplexml_load_string(file_get_contents($filename)); $xml = simplexml_load_string(file_get_contents($filename));
if ($xml === false) if ($xml === false)
{ {
return false; return null;
} }
// Get the current language. // Get the current language.

10
modules/editor/editor.model.php
View file

@ -638,12 +638,14 @@ class EditorModel extends Editor
$component_name = $component->component_name; $component_name = $component->component_name;
unset($xml_info);
$xml_info = self::getComponentXmlInfo($component_name); $xml_info = self::getComponentXmlInfo($component_name);
if (!$xml_info)
{
return (object)['enabled' => false];
}
$xml_info->enabled = $component->enabled; $xml_info->enabled = $component->enabled;
$xml_info->target_group = array(); $xml_info->target_group = array();
$xml_info->mid_list = array(); $xml_info->mid_list = array();
if($component->extra_vars) if($component->extra_vars)
@ -690,7 +692,7 @@ class EditorModel extends Editor
// Get from cache // Get from cache
$cache_key = sprintf('editor:component:%s:%s:%d', $component, $lang_type, $xml_mtime); $cache_key = sprintf('editor:component:%s:%s:%d', $component, $lang_type, $xml_mtime);
$info = Rhymix\Framework\Cache::get($cache_key); $info = Rhymix\Framework\Cache::get($cache_key);
if ($info !== null && FALSE) if (!empty($info))
{ {
return $info; return $info;
} }