From 897eee4fffc463cce08412cda08ce6c0dea6fc53 Mon Sep 17 00:00:00 2001
From: elixirel <elixirel@sourceforge.jp>
Date: Fri, 6 May 2011 15:17:49 +0900
Subject: [PATCH] - Android mode fix.

---
 erbtemp/editentry.html.erb | 2 +-
 erbtemp/newentry.html.erb  | 2 +-
 feedgenerator.rb           | 6 ------
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/erbtemp/editentry.html.erb b/erbtemp/editentry.html.erb
index 3341e29..5900255 100644
--- a/erbtemp/editentry.html.erb
+++ b/erbtemp/editentry.html.erb
@@ -3,7 +3,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <title><%= APPTITLE %></title>
         <link rel="stylesheet" href="./erbtemp/stylesheet.css" type="text/css">
-        <% unless cgi.user_agent =~ /(iPod|iPhone|iPad)/ %>
+        <% unless cgi.user_agent =~ /(iPod|iPhone|iPad|Android)/ %>
         <link rel="stylesheet" type="text/css" href="./yui/build/menu/assets/skins/sam/menu.css" />
         <link rel="stylesheet" type="text/css" href="./yui/build/button/assets/skins/sam/button.css" />
         <link rel="stylesheet" type="text/css" href="./yui/build/fonts/fonts-min.css" />
diff --git a/erbtemp/newentry.html.erb b/erbtemp/newentry.html.erb
index 2fe12fe..e03229c 100644
--- a/erbtemp/newentry.html.erb
+++ b/erbtemp/newentry.html.erb
@@ -3,7 +3,7 @@
         <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
         <title><%= APPTITLE %></title>
         <link rel="stylesheet" href="./erbtemp/stylesheet.css" type="text/css">
-        <% unless cgi.user_agent =~ /(iPod|iPhone|iPad)/ %>
+        <% unless cgi.user_agent =~ /(iPod|iPhone|iPad|Android)/ %>
         <link rel="stylesheet" type="text/css" href="./yui/build/menu/assets/skins/sam/menu.css" />
         <link rel="stylesheet" type="text/css" href="./yui/build/button/assets/skins/sam/button.css" />
         <link rel="stylesheet" type="text/css" href="./yui/build/fonts/fonts-min.css" />
diff --git a/feedgenerator.rb b/feedgenerator.rb
index f6254f7..e3fb316 100644
--- a/feedgenerator.rb
+++ b/feedgenerator.rb
@@ -1303,8 +1303,6 @@ def main
   # ログアウト処理
   if params["mode"] == "logout"
     session["login"] = nil
-    session["logini"] = nil
-    session["password"] = nil
     session.delete
   end
   
@@ -1323,8 +1321,6 @@ def main
         File.delete("./work/#{session.session_id}.dat")
         # PStoreが破損していた場合はセッション情報を破棄する
         session["login"] = nil
-        session["logini"] = nil
-        session["password"] = nil
         session.delete
       end
       
@@ -1340,8 +1336,6 @@ def main
       # エラー画面移行時はセッション情報を破棄する
       if params["mode"] == "error"
         session["login"] = nil
-        session["logini"] = nil
-        session["password"] = nil
         session.delete
       end
     end
-- 
2.11.0