aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-09 01:25:42 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-09 01:25:42 +0000
commit2bb58d49502f22c095e8baaa299bc10095f158de (patch)
treef5097890176d18df7dc7ba119452a4bd9140ff9b
parent0154f867118ce33b2cfaa51677436e00502e223f (diff)
downloadelgg-2bb58d49502f22c095e8baaa299bc10095f158de.tar.gz
elgg-2bb58d49502f22c095e8baaa299bc10095f158de.tar.bz2
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
-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);
}
/**