From 8ab380d6ddee3a974f011df07fb1a57deb01eb94 Mon Sep 17 00:00:00 2001
From: Alexey Verkhovsky <averkhov@thoughtworks.com>
Date: Thu, 10 Feb 2005 21:41:31 +0000
Subject: [PATCH] Deconflicting a name of an input for two forms on the same
 page

---
 app/controllers/wiki_controller.rb      | 2 +-
 app/views/admin/edit_web.rhtml          | 2 +-
 test/functional/wiki_controller_test.rb | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb
index 1befd15a..9c221329 100644
--- a/app/controllers/wiki_controller.rb
+++ b/app/controllers/wiki_controller.rb
@@ -89,7 +89,7 @@ class WikiController < ApplicationController
   end
 
   def remove_orphaned_pages
-    if wiki.authenticate(@params['system_password'])
+    if wiki.authenticate(@params['system_password_orphaned'])
       wiki.remove_orphaned_pages(@web_name)
       flash[:info] = 'Orphaned pages removed'
       redirect_to :action => 'list'
diff --git a/app/views/admin/edit_web.rhtml b/app/views/admin/edit_web.rhtml
index 37b35a1d..468c4310 100644
--- a/app/views/admin/edit_web.rhtml
+++ b/app/views/admin/edit_web.rhtml
@@ -118,7 +118,7 @@
   <p align="right">
     <small>
       Clean up by entering system password
-      <input type="password" id="system_password_orphaned" name="system_password" />
+      <input type="password" id="system_password_orphaned" name="system_password_orphaned" />
       and
       <input type="submit" value="Delete Orphan Pages" />
     </small>
diff --git a/test/functional/wiki_controller_test.rb b/test/functional/wiki_controller_test.rb
index 810dbe2b..d6d091a8 100755
--- a/test/functional/wiki_controller_test.rb
+++ b/test/functional/wiki_controller_test.rb
@@ -333,7 +333,7 @@ class WikiControllerTest < Test::Unit::TestCase
         "category: trees", 
         Time.now, Author.new('TreeHugger', '127.0.0.2'))
 
-    r = process('remove_orphaned_pages', 'web' => 'wiki1', 'system_password' => 'pswd')
+    r = process('remove_orphaned_pages', 'web' => 'wiki1', 'system_password_orphaned' => 'pswd')
 
     assert_redirected_to :action => 'list'
     assert_equal [@home, @oak], @web.select.sort,