Fixed error message display in admin/edit_web - Rails flash handling apparently has changed

app/controllers/admin_controller.rb

@@ -36,7 +36,7 @@ class AdminController < ApplicationController
           redirect_to :web => @params['address'], :controller => 'wiki', :action => 'new', 
               :id => 'HomePage'
         rescue Instiki::ValidationError => e
-          flash[:error] = e.message
+          @error = e.message
           # and re-render the form again
         end
       else 
@@ -48,6 +48,7 @@ class AdminController < ApplicationController
   end
 
   def edit_web
+
     system_password = @params['system_password']
     if system_password
       # form submitted
@@ -68,11 +69,11 @@ class AdminController < ApplicationController
           flash[:info] = "Web '#{@params['address']}' was successfully updated"
           redirect_home(@params['address'])
         rescue Instiki::ValidationError => e
-          flash[:error] = e.message
+          @error = e.message
           # and re-render the same template again
         end
       else
-        flash[:error] = password_error(system_password)
+        @error = password_error(system_password)
         # and re-render the same template again
       end
     else

app/controllers/file_controller.rb

@@ -36,8 +36,8 @@ class FileController < ApplicationController
     if @params['file']
       # form supplied
       file_yard.upload_file(@file_name, @params['file'])
-      flash[:info] = "Image '#{@file_name}' successfully uploaded"
       @web.refresh_pages_with_references(@file_name)
+      flash[:info] = "Image '#{@file_name}' successfully uploaded"
       return_to_last_remembered
     elsif file_yard.has_file?(@file_name)
       send_file(file_yard.file_path(@file_name))
@@ -59,7 +59,7 @@ class FileController < ApplicationController
       if @problems.empty?
         flash[:info] = 'Import successfully finished'
       else
-        flash[:info] = "Import finished, but some pages were not imported:<li>" + 
+        flash[:error] = "Import finished, but some pages were not imported:<li>" + 
             @problems.join('</li><li>') + '</li>'
       end
       return_to_last_remembered