aboutsummaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to 'engine')
-rw-r--r--engine/classes/ElggPlugin.php9
-rw-r--r--engine/lib/plugins.php2
2 files changed, 1 insertions, 10 deletions
diff --git a/engine/classes/ElggPlugin.php b/engine/classes/ElggPlugin.php
index 2ad759f31..c57171eff 100644
--- 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 26ec2c726..1605ed76f 100644
--- 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);
}
/**