2 files changed, 2 insertions, 73 deletions
diff --git a/views/default/forms/admin/plugins/simple_update_states.php b/views/default/forms/admin/plugins/simple_update_states.php
index bf9f4e4c1..938eddb26 100644
--- a/views/default/forms/admin/plugins/simple_update_states.php
+++ b/views/default/forms/admin/plugins/simple_update_states.php
@@ -24,78 +24,6 @@ foreach ($installed_plugins as $plugin) {
 
 ksort($plugin_list);
 
-echo <<<___END
-	<ul>
-___END;
-
-$actions_base = '/action/admin/plugins/';
-$ts = time();
-$token = generate_action_token($ts);
-
-foreach ($plugin_list as $name => $plugin) {
-	$plugin_guid = $plugin->guid;
-	$plugin_id = $plugin->getID();
-	$active = $plugin->isActive();
-	$can_activate = $plugin->canActivate();
-	$author = $plugin->manifest->getAuthor();
-	$version = $plugin->manifest->getVersion();
-	$website = $plugin->manifest->getWebsite();
-	$description = $plugin->manifest->getDescription();
-
-	if ($active) {
-		$active_class = 'elgg-state-active';
-		$checked = 'checked="checked"';
-	} else {
-		$active_class = 'elgg-state-inactive';
-		$checked = '';
-	}
-
-	if ($can_activate) {
-		$disabled = '';
-	} else {
-		$disabled = 'disabled="disabled"';
-		$description .= '<p>' . elgg_echo('admin:plugins:simple:cannot_activate') . '</p>';
-	}
-
-	$description = elgg_view('output/longtext', array('value' => $description));
-
-	$plugin_footer = '<ul class="elgg-menu elgg-menu-footer">';
-	
-	if ($author) {
-		$plugin_footer .= '<li>' . elgg_echo('admin:plugins:author', array($author)) . '</li>';
-	}
-
-	if ($version) {
-		$plugin_footer .= '<li>' . elgg_echo('admin:plugins:version', array($version)) . '</li>';
-	}
-
-	if ($website) {
-		$plugin_footer .= "<li><a href=\"$website\">" . elgg_echo('admin:plugins:plugin_website') . '</a></li>';
-	}
-
-	if (elgg_view_exists("settings/$plugin_id/edit")) {
-		$settings_href = elgg_get_site_url() . "pg/admin/plugin_settings/$plugin_id";
-		$plugin_footer .= "<li><a class='plugin_settings link' href='$settings_href'>" . elgg_echo('settings') . "</a></li>";
-	}
-	
-	$plugin_footer .= "</ul>";
-
-	echo <<<___END
-	<li class="elgg-plugin $active_class">
-		<div class="elgg-grid">
-			<div class="elgg-col elgg-col-1of5">
-				<input type="checkbox" id="$plugin_guid" $checked $disabled name="active_plugin_guids[]" value="$plugin_guid"/>
-				<label for="$plugin_guid">$name</label>
-			</div>
-			<div class="elgg-col elgg-col-4of5">
-				$description
-				$plugin_footer
-			</div>
-		</div>
-	</li>
-___END;
-}
-
-echo '</ul>';
+echo elgg_view_entity_list($plugin_list, 0, 0, 0, false, false, false);
 echo elgg_view('input/submit', array('value' => elgg_echo('save')));
 echo elgg_view('input/reset', array('value' => elgg_echo('reset')));
diff --git a/views/default/forms/plugins/usersettings/save.php b/views/default/forms/plugins/usersettings/save.php
index 8532cdfd1..bf243ae6b 100644
--- a/views/default/forms/plugins/usersettings/save.php
+++ b/views/default/forms/plugins/usersettings/save.php
@@ -1,4 +1,5 @@
 <?php
 $vars['type'] = 'user';
 
+// Can't use elgg_view_form() because it overrides the $vars['action'] parameter
 echo elgg_view('forms/plugins/settings/save', $vars);
 \ No newline at end of file