Refs #2869: Fixed problems when deleting user settings using wrapper function.

git-svn-id: http://code.elgg.org/elgg/trunk@8085 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php
index 2ad759f3128aef07b0f5219e632f1170409508ce..c57171effb8ab3f70c12e0ca503de7d1260e740e 100644 (file)
--- a/engine/classes/ElggPlugin.php
+++ b/engine/classes/ElggPlugin.php
@@ -403,15 +403,6 @@ class ElggPlugin extends ElggObject {
                        return false;
                }
 
-               // Hook to validate setting
-               // note this doesn't pass the namespaced name!
-               $value = elgg_trigger_plugin_hook('plugin:usersetting', 'user', array(
-                       'user' => $user,
-                       'plugin' => $this->getID(),
-                       'name' => $name,
-                       'value' => $value
-               ), $value);
-
                // set the namespaced name.
                $name = elgg_namespace_plugin_private_setting('user_setting', $name, $this->getID());
 

diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php
index 26ec2c72673971f72cf3a5d9e0d65acdf05a6db6..1605ed76ff7cd5274df26ed570bd3352334c123b 100644 (file)
--- a/engine/lib/plugins.php
+++ b/engine/lib/plugins.php
@@ -875,7 +875,7 @@ function clear_plugin_usersetting($name, $user_guid = 0, $plugin_id = '') {
                return false;
        }
 
-       return $plugin->removeUserSetting($user_guid, $name);
+       return $plugin->removeUserSetting($name, $user_guid);
 }
 
 /**