Merge branch 'zenops_61' into 'master'

* Fix error for php5.3.

See merge request easycorp/zentaopms!6909
This commit is contained in:
孙广明
2023-02-10 05:27:52 +00:00
3 changed files with 21 additions and 1 deletions
+20
View File
@@ -981,6 +981,11 @@ if(!function_exists('array_column'))
$valueSet = true;
$value = $row[$columnKey];
}
elseif(\is_object($row) && \property_exists($row, $columnKey))
{
$valueSet = true;
$value = $row->$columnKey;
}
if($valueSet)
{
@@ -998,3 +1003,18 @@ if(!function_exists('array_column'))
return $output;
}
}
if (!function_exists('getallheaders')) {
function getallheaders()
{
$headers = array();
foreach ($_SERVER as $name => $value)
{
if (substr($name, 0, 5) == 'HTTP_')
{
$headers[str_replace(' ', '-', ucwords(strtolower(str_replace('_', ' ', substr($name, 5)))))] = $value;
}
}
return $headers;
}
}
+1 -1
View File
@@ -416,7 +416,7 @@ $lang->action->label->resume = '恢复了';
$lang->action->label->reboot = '重启了';
$lang->action->label->boot = '启动了';
$lang->action->label->destroy = '关闭了';
$lang->action->label->getvnc = '远程操控';
$lang->action->label->getvnc = '远程操控了';
$lang->action->label->synctwins = '同步修改了';
$lang->action->label->relieved = '解除了';
$lang->action->label->switchtolight = '从全生命周期管理模式切换为轻量管理模式';