From: Bram Matthys Date: Wed, 26 Apr 2023 06:56:00 +0000 (+0200) Subject: Fix del_usermeta() not working for both sql_db and file_db X-Git-Tag: 0.9~76 X-Git-Url: https://jfr.im/git/irc/unrealircd/unrealircd-webpanel.git/commitdiff_plain/c53841fe9ca983edbebbd9de2615a872686c8d3c Fix del_usermeta() not working for both sql_db and file_db (We just didn't notice until now) --- diff --git a/Classes/class-paneluser.php b/Classes/class-paneluser.php index a579e08..9d11d99 100644 --- a/Classes/class-paneluser.php +++ b/Classes/class-paneluser.php @@ -135,7 +135,9 @@ class PanelUser "id" => $this->id, "key" => $key, ]; - Hook::run(HOOKTYPE_USERMETA_DEL, $meta); + $array['meta'] = $meta; + $array['user'] = $this; + Hook::run(HOOKTYPE_USERMETA_DEL, $array); } diff --git a/plugins/file_db/file_db.php b/plugins/file_db/file_db.php index 4679211..ab8070b 100644 --- a/plugins/file_db/file_db.php +++ b/plugins/file_db/file_db.php @@ -127,8 +127,11 @@ class file_db return true; } - public static function del_usermeta(&$u) + public static function del_usermeta(&$meta) { + GLOBAL $db; + + $meta = $meta['meta']; $uid = $meta['id']; $key = $meta['key']; diff --git a/plugins/sql_db/sql_db.php b/plugins/sql_db/sql_db.php index 7ca18e9..56de959 100644 --- a/plugins/sql_db/sql_db.php +++ b/plugins/sql_db/sql_db.php @@ -265,12 +265,12 @@ class sql_db return false; } } - public static function del_usermeta(&$u) + public static function del_usermeta(&$meta) { $conn = sqlnew(); $query = "DELETE FROM " . get_config("mysql::table_prefix") . "user_meta WHERE user_id = :id AND meta_key = :key"; $stmt = $conn->prepare($query); - $stmt->execute($u['meta']); + $stmt->execute($meta['meta']); if ($stmt->rowCount()) return true; return false;