Merged trunk r1773.

git-svn-id: http://redmine.rubyforge.org/svn/branches/work@1774 e93f8b46-1217-0410-a6f0-8f06a7374b81

groups/app/controllers/settings_controller.rb

@@ -16,7 +16,6 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 class SettingsController < ApplicationController
-  layout 'base'	
   before_filter :require_admin
   
   def index
@@ -39,6 +38,7 @@ class SettingsController < ApplicationController
     end
     @options = {}
     @options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] }
+    @deliveries = ActionMailer::Base.perform_deliveries
   end
   
   def plugin
@@ -49,7 +49,7 @@ class SettingsController < ApplicationController
       flash[:notice] = l(:notice_successful_update)
       redirect_to :action => 'plugin', :id => params[:id]
     end
-    @partial = "../../vendor/plugins/#{plugin_id}/app/views/" + @plugin.settings[:partial]
+    @partial = @plugin.settings[:partial]
     @settings = Setting["plugin_#{plugin_id}"]
   end
 end