1 files changed, 30 insertions, 18 deletions
diff --git a/actions/plugins/settings/save.php b/actions/plugins/settings/save.php
index bbbb6a367..581a2f9ec 100644
--- a/actions/plugins/settings/save.php
+++ b/actions/plugins/settings/save.php
@@ -1,31 +1,43 @@
 <?php
 /**
- * Elgg plugin settings save action.
+ * Saves global plugin settings.
  *
- * @package Elgg
- * @subpackage Core
- * @author Curverider Ltd
- * @link http://elgg.org/
+ * This action can be overriden for a specific plugin by creating the
+ * <plugin_id>/settings/save action in that plugin.
+ *
+ * @uses array $_REQUEST['params']    A set of key/value pairs to save to the ElggPlugin entity
+ * @uses int   $_REQUEST['plugin_id'] The ID of the plugin
+ *
+ * @package Elgg.Core
+ * @subpackage Plugins.Settings
  */
 
 $params = get_input('params');
-$plugin = get_input('plugin');
+$plugin_id = get_input('plugin_id');
+$plugin = elgg_get_plugin_from_id($plugin_id);
 
-gatekeeper();
+if (!($plugin instanceof ElggPlugin)) {
+	register_error(elgg_echo('plugins:settings:save:fail', array($plugin_id)));
+	forward(REFERER);
+}
 
-$result = false;
+$plugin_name = $plugin->getManifest()->getName();
 
-foreach ($params as $k => $v) {
-	// Save
-	$result = set_plugin_setting($k, $v, $plugin);
+$result = false;
 
-	// Error?
-	if (!$result) {
-		register_error(sprintf(elgg_echo('plugins:settings:save:fail'), $plugin));
-		forward($_SERVER['HTTP_REFERER']);
-		exit;
+// allow a plugin to override the save action for their settings
+if (elgg_action_exists("$plugin_id/settings/save")) {
+	action("$plugin_id/settings/save");
+} else {
+	foreach ($params as $k => $v) {
+		$result = $plugin->setSetting($k, $v);
+		if (!$result) {
+			register_error(elgg_echo('plugins:settings:save:fail', array($plugin_name)));
+			forward(REFERER);
+			exit;
+		}
 	}
 }
 
-system_message(sprintf(elgg_echo('plugins:settings:save:ok'), $plugin));
-forward($_SERVER['HTTP_REFERER']);
+system_message(elgg_echo('plugins:settings:save:ok', array($plugin_name)));
+forward(REFERER);
+\ No newline at end of file