aboutsummaryrefslogtreecommitdiff
path: root/actions/plugins
diff options
context:
space:
mode:
authorBrett Profitt <brett.profitt@gmail.com>2011-08-25 10:00:38 -0700
committerBrett Profitt <brett.profitt@gmail.com>2011-08-25 10:00:38 -0700
commitdccc333c765bb28da55b4a55d9c916acdb88413a (patch)
treebdd26a0b4cd85241a19b7fcb2c0770f0ac3eb9f0 /actions/plugins
parentec7b94a64aef23b85866ecdac8e8acc712d29bb6 (diff)
parent003cb81c7888f4d2fd763e5814027c6f8d71186f (diff)
downloadelgg-dccc333c765bb28da55b4a55d9c916acdb88413a.tar.gz
elgg-dccc333c765bb28da55b4a55d9c916acdb88413a.tar.bz2
Merge branch 'master' of github.com:brettp/Elgg
Diffstat (limited to 'actions/plugins')
-rw-r--r--actions/plugins/settings/save.php4
-rw-r--r--actions/plugins/usersettings/save.php4
2 files changed, 4 insertions, 4 deletions
diff --git a/actions/plugins/settings/save.php b/actions/plugins/settings/save.php
index 3b5694039..e94127f7c 100644
--- a/actions/plugins/settings/save.php
+++ b/actions/plugins/settings/save.php
@@ -26,8 +26,8 @@ $plugin_name = $plugin->getManifest()->getName();
$result = false;
// allow a plugin to override the save action for their settings
-if (elgg_action_exists("settings/$plugin_id/save")) {
- action("settings/$plugin_id/save");
+if (elgg_action_exists("$plugin_id/settings/save")) {
+ action("$plugin_id/settings/save");
} else {
foreach ($params as $k => $v) {
$result = $plugin->setSetting($k, $v);
diff --git a/actions/plugins/usersettings/save.php b/actions/plugins/usersettings/save.php
index c6214f68d..71ad2ad7b 100644
--- a/actions/plugins/usersettings/save.php
+++ b/actions/plugins/usersettings/save.php
@@ -39,8 +39,8 @@ if (!$user->canEdit()) {
$result = false;
-if (elgg_action_exists("usersettings/$plugin_id/save")) {
- action("usersettings/$plugin_id/save");
+if (elgg_action_exists("$plugin_id/usersettings/save")) {
+ action("$plugin_id/usersettings/save");
} else {
foreach ($params as $k => $v) {
// Save