From: Jeroen Dalsem <jdalsem@coldtrick.com>
Date: Thu, 30 May 2013 13:46:31 +0000 (+0200)
Subject: change order so plugin/[pluginname]/settings is used instead of
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=b980c75fdf5c1fecb267b8984f9ec363c1ae5658;p=lorea%2Felgg.git

change order so plugin/[pluginname]/settings is used instead of
settings/edit after upgrade of a plugin
---

diff --git a/views/default/forms/plugins/settings/save.php b/views/default/forms/plugins/settings/save.php
index dc7b2fef7..116529905 100644
--- a/views/default/forms/plugins/settings/save.php
+++ b/views/default/forms/plugins/settings/save.php
@@ -17,11 +17,11 @@ 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 class="elgg-foot">';