From 4659abbaebaf50f728b5cdc13c0f0c913be477d8 Mon Sep 17 00:00:00 2001
From: cash <cash@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 12 Feb 2011 12:11:26 +0000
Subject: continued cleaning up admin plugin settings

git-svn-id: http://code.elgg.org/elgg/trunk@8150 36083f99-b078-4883-b0ff-0f9b5a30f544
---
 views/default/admin/components/plugin_settings.php | 15 +++++----------
 views/default/forms/plugins/settings/save.php      |  3 +--
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/views/default/admin/components/plugin_settings.php b/views/default/admin/components/plugin_settings.php
index 8179728ed..30cf3d21a 100644
--- a/views/default/admin/components/plugin_settings.php
+++ b/views/default/admin/components/plugin_settings.php
@@ -11,7 +11,7 @@
 $plugin = $vars['plugin'];
 $plugin_id = $plugin->getID();
 
-if (elgg_view("settings/$plugin_id/edit")) {
+if (elgg_view_exists("settings/$plugin_id/edit")) {
 ?>
 
 <div class="elgg-module elgg-module-info">
@@ -19,15 +19,10 @@ if (elgg_view("settings/$plugin_id/edit")) {
 		<h3><?php echo $plugin->manifest->getName(); ?></h3>
 	</div>
 	<div class="elgg-body">
-		<div id="<?php echo $plugin_id; ?>_settings">
-			<?php echo elgg_view("object/plugin", array(
-				'plugin' => $plugin,
-				// in for backward compatibility
-				'entity' => $plugin,
-				'type' => 'admin'
-			));
-			?>
-		</div>
+		<?php
+			$params = array('internalid' => "$plugin_id-settings");
+			echo elgg_view_form("plugins/settings/save", $params, $vars);
+		?>
 	</div>
 </div>
 <?php
diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php
index b2d818e87..68c6b1f52 100644
--- a/views/default/forms/plugins/settings/save.php
+++ b/views/default/forms/plugins/settings/save.php
@@ -17,11 +17,10 @@ if ($type != 'user') {
 	$type = '';
 }
 
-echo elgg_view("{$type}settings/{$plugin_id}/edit", $vars);
+echo elgg_view("{$type}settings/$plugin_id/edit", $vars);
 
 echo "<p>";
 echo elgg_view('input/hidden', array('internalname' => 'plugin_id', 'value' => $plugin_id));
 echo elgg_view('input/hidden', array('internalname' => 'user_guid', 'value' => $user_guid));
 echo elgg_view('input/submit', array('value' => elgg_echo('save'))); 
 echo "</p>";
-
-- 
cgit v1.2.3