From f128b1382447200ab685dc0168b6c3a6df5a9676 Mon Sep 17 00:00:00 2001 From: Cameron Date: Sun, 17 Feb 2019 15:37:13 -0800 Subject: [PATCH] Issue #3668 PHP 7.3 compatibility fix. --- e107_admin/userclass2.php | 5 ++--- e107_handlers/userclass_class.php | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php index 39e1021d5..d08e89bc7 100644 --- a/e107_admin/userclass2.php +++ b/e107_admin/userclass2.php @@ -141,7 +141,7 @@ e107::coreLan('userclass2', true); return e107::getSingleton('user_class_admin'); } - public function beforeCreate($new_data) + public function beforeCreate($new_data, $old_data) { return $new_data; } @@ -157,7 +157,6 @@ e107::coreLan('userclass2', true); public function beforeUpdate($new_data, $old_data, $id) { - if(!empty($new_data['perms'])) { $new_data['userclass_perms'] = implode(".",$new_data['perms']); @@ -173,7 +172,7 @@ e107::coreLan('userclass2', true); e107::getUserClass()->clearCache(); } - public function afterDelete($data,$id) + public function afterDelete($data,$id, $check = false) { e107::getUserClass()->clearCache(); } diff --git a/e107_handlers/userclass_class.php b/e107_handlers/userclass_class.php index 10e3d1f8f..5bf44ee6e 100644 --- a/e107_handlers/userclass_class.php +++ b/e107_handlers/userclass_class.php @@ -1486,8 +1486,8 @@ class user_class_admin extends user_class */ protected function show_graphical_subtree($listnum, $indent_images, $is_last = FALSE) { - - $num_children = count(vartrue($this->class_tree[$listnum]['class_children'])); + $tree = vartrue($this->class_tree[$listnum]['class_children'], array()); + $num_children = count($tree); $is_open = TRUE; $tag_name = 'uclass_tree_'.$listnum;