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 a579e088add856485512645f3c09069b2eea5ce6..9d11d99b3c238adca956b3ca89274c2082a15a25 100644 (file)
--- 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 46792112303621d3e94f9a1f83d5294c26bb94e8..ab8070ba2c76865ca8d6a439c2021386516c4d31 100644 (file)
--- 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 7ca18e9827c7ef5e0390842a0a9d88f8fc8f5c31..56de95953a8ce860c7ef79ae7d1216cb29da0ac4 100644 (file)
--- 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;