2 files changed, 15 insertions, 6 deletions
diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php
index efe6d7792..116529905 100644
--- a/views/default/forms/plugins/settings/save.php
+++ b/views/default/forms/plugins/settings/save.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Used to show plugin user settings.
+ * Used to show plugin settings for both users and admins.
  *
  * @package Elgg.Core
  * @subpackage Plugins
@@ -17,15 +17,15 @@ if ($type != 'user') {
 	$type = '';
 }
 
-if (elgg_view_exists("{$type}settings/$plugin_id/edit")) {
+if (elgg_view_exists("plugins/$plugin_id/{$type}settings")) {
+	echo elgg_view("plugins/$plugin_id/{$type}settings", $vars);
+} elseif (elgg_view_exists("{$type}settings/$plugin_id/edit")) {
 	elgg_deprecated_notice("{$type}settings/$plugin_id/edit was deprecated in favor of plugins/$plugin_id/{$type}settings", 1.8);
 	echo elgg_view("{$type}settings/$plugin_id/edit", $vars);
-} else {
-	echo elgg_view("plugins/$plugin_id/{$type}settings", $vars);
 }
 
-echo "<div>";
+echo '<div class="elgg-foot">';
 echo elgg_view('input/hidden', array('name' => 'plugin_id', 'value' => $plugin_id));
 echo elgg_view('input/hidden', array('name' => 'user_guid', 'value' => $user_guid));
 echo elgg_view('input/submit', array('value' => elgg_echo('save')));
-echo "</div>";
+echo '</div>';
diff --git a/views/default/forms/plugins/usersettings/save.php b/views/default/forms/plugins/usersettings/save.php
index bf243ae6b..ced88f818 100644
--- a/views/default/forms/plugins/usersettings/save.php
+++ b/views/default/forms/plugins/usersettings/save.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Plugin user settings
+ *
+ * Calls the plugin admin settings form body with type set to 'user'
+ * 
+ * @package Elgg.Core
+ * @subpackage Plugins
+ */
+
 $vars['type'] = 'user';
 
 // Can't use elgg_view_form() because it overrides the $vars['action'] parameter