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

Fix deprecated ${var} syntax

Browse source
This commit is contained in:
Kijin Sung 2022-12-29 00:44:51 +09:00
parent 81daa1fa17
commit 30493947d8
3 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
classes/template/TemplateHandler.class.php
View file

@ -153,7 +153,7 @@ class TemplateHandler
$error_message = vsprintf('Template not found: %s%s%s', array( $error_message = vsprintf('Template not found: %s%s%s', array(
$tpl_path, $tpl_path,
preg_replace('/\.html$/i', '', $tpl_filename) . '.html', preg_replace('/\.html$/i', '', $tpl_filename) . '.html',
$tpl_file ? " (${tpl_file})" : '', $tpl_file ? " ($tpl_file)" : '',
)); ));
trigger_error($error_message, \E_USER_WARNING); trigger_error($error_message, \E_USER_WARNING);
return escape($error_message); return escape($error_message);

2
modules/admin/controllers/ServerEnv.php
View file

@ -225,7 +225,7 @@ class ServerEnv extends Base
{ {
if (is_array($value)) if (is_array($value))
{ {
$value = implode(', ', $value) ?: "no additional ${key}s"; $value = implode(', ', $value) ?: "no additional {$key}s";
} }
if (is_int($key) || ctype_digit($key)) if (is_int($key) || ctype_digit($key))

12
modules/file/file.admin.view.php
View file

@ -127,16 +127,20 @@ class FileAdminView extends File
} }
} }
if($file->upload_target_type && isset(${$file->upload_target_type.'_srls'}) && is_array(${$file->upload_target_type.'_srls'})) if (in_array($file->upload_target_type, ['doc', 'com']))
{ {
if(!in_array($file->upload_target_srl, ${$file->upload_target_type.'_srls'})) $var = $file->upload_target_type . '_srls';
if (!in_array($target_srl, $$var))
{ {
${$file->upload_target_type.'_srls'}[] = $target_srl; $$var[] = $target_srl;
} }
} }
if (!in_array($file->module_srl, $mod_srls))
{
$mod_srls[] = $file->module_srl;
}
$file_list[$file_srl] = $file; $file_list[$file_srl] = $file;
$mod_srls[] = $file->module_srl;
} }
// Remove duplication // Remove duplication
$doc_srls = array_unique($doc_srls); $doc_srls = array_unique($doc_srls);