--- ./default/account/auth/login-small.html.tmpl.orig	2012-09-05 20:34:25.000000000 +0200
+++ ./default/account/auth/login-small.html.tmpl	2012-09-05 20:40:35.000000000 +0200
@@ -28,7 +28,7 @@
  [% login_target = "index.cgi" %]
 [% END %]
 
-[% login_target = urlbase _ login_target %]                                    
+[% login_target = urlbase _ login_target %]
 
 <li id="mini_login_container[% qs_suffix %]">
   <span class="separator">| </span>
@@ -36,8 +36,8 @@
   [% IF cgi.request_method == "GET" AND cgi.query_string %]
     [% connector = "&" %]
   [% END %]
-  [% script_name = login_target _ connector _ "GoAheadAndLogIn=1" %]
-  <a id="login_link[% qs_suffix %]" href="[% script_name FILTER html %]"
+  [% script_url = login_target _ connector _ "GoAheadAndLogIn=1" %]
+  <a id="login_link[% qs_suffix %]" href="[% script_url FILTER html %]"
      onclick="return show_mini_login_form('[% qs_suffix %]')">ログイン</a>
 
   [% Hook.process('additional_methods') %]
@@ -72,7 +72,6 @@
                  [%+ "checked" IF Param('rememberlogin') == "defaulton" %]>
       <label for="Bugzilla_remember[% qs_suffix %]">記憶する</label>
     [% END %]
-
     <input type="submit" name="GoAheadAndLogIn" value="ログイン" 
             id="log_in[% qs_suffix %]">
     <script type="text/javascript">
@@ -115,7 +114,7 @@
 </li>
 <li id="forgot_container[% qs_suffix %]">
   <span class="separator">| </span>
-  <a id="forgot_link[% qs_suffix %]" href="[% script_name FILTER html %]#forgot"
+  <a id="forgot_link[% qs_suffix %]" href="[% script_url FILTER html %]#forgot"
      onclick="return show_forgot_form('[% qs_suffix %]')">パスワードを忘れた</a>
   <form action="token.cgi" method="post" id="forgot_form[% qs_suffix %]"
         class="mini_forgot bz_default_hidden">
@@ -124,6 +123,7 @@
     <input id="forgot_button[% qs_suffix %]" value="Reset Password" 
            type="submit">
     <input type="hidden" name="a" value="reqpw">
+    <input type="hidden" id="token" name="token" value="[% issue_hash_token(['reqpw']) FILTER html %]">
     <a href="#" onclick="return hide_forgot_form('[% qs_suffix %]')">[x]</a>
   </form>
 </li>
--- ./default/account/auth/login.html.tmpl.orig	2012-09-05 20:40:51.000000000 +0200
+++ ./default/account/auth/login.html.tmpl	2012-09-05 20:41:50.000000000 +0200
@@ -114,6 +114,7 @@
       アカウント登録済みだけれども、パスワードを忘れた場合、
       ログイン名を以下に入力して、パスワード変更の要請を送信してください。<br>
       <input size="35" name="loginname">
+      <input type="hidden" id="token" name="token" value="[% issue_hash_token(['reqpw']) FILTER html %]">
       <input type="submit" id="request" value="パスワードリセット">
     </form>
   [% END %]
--- ./default/filterexceptions.pl.orig	2012-09-05 20:42:11.000000000 +0200
+++ ./default/filterexceptions.pl	2012-09-05 20:42:27.000000000 +0200
@@ -154,7 +154,6 @@
 'list/table.html.tmpl' => [
   'tableheader',
   'bug.bug_id', 
-  'abbrev.$id.title || field_descs.$id || column.title',
 ],
 
 'list/list.csv.tmpl' => [
--- ./default/global/user-error.html.tmpl.orig	2012-09-05 20:43:09.000000000 +0200
+++ ./default/global/user-error.html.tmpl	2012-09-05 20:46:11.000000000 +0200
@@ -1356,7 +1356,7 @@
     [% title = BLOCK %] 指定された [% jawords.saved_search FILTER html %] がありません [% END %]
     [% docslinks = {'query.html' => "$terms.bugs の検索",
                     'query.html#list' => "$terms.Bug リスト"} %]
-    <em>[% queryname FILTER html %]</em> という [% jawords.search_saved_search FILTER html %] は
+    <em>[% name FILTER html %]</em> という [% jawords.search_saved_search FILTER html %] は
     [% IF sharer_id && sharer_id != user.id %]
       あなたのアカウントから利用できません。
     [% ELSE %]
--- ./default/list/table.html.tmpl.orig	2012-09-05 20:46:26.000000000 +0200
+++ ./default/list/table.html.tmpl	2012-09-05 20:47:11.000000000 +0200
@@ -133,7 +133,7 @@
       [% PROCESS new_order %]
       [%-#%]&amp;query_based_on=
       [% defaultsavename OR searchname FILTER uri %]">
-        [%- abbrev.$id.title || field_descs.$id || column.title -%]
+        [%- abbrev.$id.title || field_descs.$id || column.title FILTER html -%]
         [% PROCESS order_arrow ~%]
     </a>
   </th>
--- ./default/search/search-advanced.html.tmpl.orig	2012-09-05 20:47:32.000000000 +0200
+++ ./default/search/search-advanced.html.tmpl	2012-09-05 20:48:59.000000000 +0200
@@ -31,7 +31,13 @@
 
 
 [% js_data = BLOCK %]
-var queryform = "queryform"
+var queryform = "queryform";
+function remove_token() {
+  if (queryform.token) {
+    var asDefault = document.getElementById('remasdefault');
+    queryform.token.disabled = !asDefault.checked;
+  }
+}
 [% END %]
 
 [% PROCESS global/header.html.tmpl
@@ -53,7 +59,8 @@
 
 <p id="search_help">ヘルプを見るにはフィールドのラベルにカーソルを当ててください。</p>
 
-<form method="post" action="buglist.cgi" name="queryform" id="queryform">
+<form method="post" action="buglist.cgi" name="queryform" id="queryform"
+      onsubmit="remove_token()">
 
 [% PROCESS search/form.html.tmpl %]