From 638d4bd8b891170c1e238870b58bf87f0c8d77d8 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Fri, 1 Apr 2022 14:40:38 +0800 Subject: [PATCH] * Fix bug#21383. --- module/dept/model.php | 2 +- module/tree/model.php | 2 +- module/user/model.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/dept/model.php b/module/dept/model.php index 965c77337e..ae8d912786 100644 --- a/module/dept/model.php +++ b/module/dept/model.php @@ -112,7 +112,7 @@ class deptModel extends model krsort($deptMenu); $topMenu = array_pop($deptMenu); - $topMenu = explode("\n", trim($topMenu)); + $topMenu = explode("\n", trim((string)$topMenu)); $lastMenu[] = '/'; foreach($topMenu as $menu) { diff --git a/module/tree/model.php b/module/tree/model.php index a67643938f..ae318d04cb 100644 --- a/module/tree/model.php +++ b/module/tree/model.php @@ -176,7 +176,7 @@ class treeModel extends model ksort($treeMenu); $topMenu = @array_shift($treeMenu); - $topMenu = explode("\n", trim($topMenu)); + $topMenu = explode("\n", trim((string)$topMenu)); $lastMenu[] = '/'; foreach($topMenu as $menu) { diff --git a/module/user/model.php b/module/user/model.php index 2f4e5f94c5..a8050eef9f 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -424,7 +424,7 @@ class userModel extends model $data[$i]->type = 'inside'; $data[$i]->realname = $users->realname[$i]; $data[$i]->role = $role; - $data[$i]->group = in_array('ditto', $users->group[$i]) ? (isset($prev['group']) ? $prev['group'] : '') : $users->group[$i]; + $data[$i]->group = in_array('ditto', isset($users->group[$i]) ? $users->group[$i] : array()) ? (isset($prev['group']) ? $prev['group'] : '') : $users->group[$i]; $data[$i]->email = $users->email[$i]; $data[$i]->gender = $users->gender[$i]; $data[$i]->password = md5(trim($users->password[$i]));