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

Convert potentially problematic parameters to string before passing from legacy function to Rhymix Framework

Browse source
This commit is contained in:
Kijin Sung 2023-09-26 20:34:30 +09:00
parent 9ca2c94fe4
commit ea9f469513
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/legacy.php
View file

@ -492,7 +492,7 @@ function cut_str($string, $cut_size = 0, $tail = '...'): string
*/ */
function get_time_zone_offset($timezone): int function get_time_zone_offset($timezone): int
{ {
return Rhymix\Framework\DateTime::getTimezoneOffsetByLegacyFormat($timezone); return Rhymix\Framework\DateTime::getTimezoneOffsetByLegacyFormat((string)$timezone);
} }
/** /**
@ -638,7 +638,7 @@ function zdate($str, $format = 'Y-m-d H:i:s', $conversion = false): ?string
} }
// get unixtime by using ztime() for date() function's argument. // get unixtime by using ztime() for date() function's argument.
$result = Rhymix\Framework\DateTime::formatTimestampForCurrentUser($format, ztime($str)); $result = Rhymix\Framework\DateTime::formatTimestampForCurrentUser((string)$format, ztime($str));
// change day and am/pm for each language // change day and am/pm for each language
if(preg_match('/[MFAa]/', $format)) if(preg_match('/[MFAa]/', $format))
@ -892,7 +892,7 @@ function stripEmbedTagForAdmin(&$content, $writer_member_srl): void
$security_msg = '<div style="border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;">' . $security_msg = '<div style="border: 1px solid #DDD; background: #FAFAFA; text-align:center; margin: 1em 0;">' .
'<p style="margin: 1em;">' . lang('security_warning_embed') . '</p></div>'; '<p style="margin: 1em;">' . lang('security_warning_embed') . '</p></div>';
$content = Rhymix\Framework\Filters\MediaFilter::removeEmbeddedMedia($content, $security_msg); $content = Rhymix\Framework\Filters\MediaFilter::removeEmbeddedMedia((string)$content, $security_msg);
} }
return; return;