From 4a0f9d5b7bfd148ead0a813e020357c5b11230e9 Mon Sep 17 00:00:00 2001
From: Damian Mooyman <damian.mooyman@gmail.com>
Date: Thu, 3 Oct 2013 17:10:56 +1300
Subject: [PATCH 1/2] BUG Issue with login form failing to login in certain
 situations. Fixes issue #2424

---
 security/MemberLoginForm.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/security/MemberLoginForm.php b/security/MemberLoginForm.php
index cb584539c..4d2d5c400 100644
--- a/security/MemberLoginForm.php
+++ b/security/MemberLoginForm.php
@@ -14,6 +14,15 @@ class MemberLoginForm extends LoginForm {
 
 	protected $authenticator_class = 'MemberAuthenticator';
 	
+	/**
+	 * Since the logout and dologin actions may be conditionally removed, it's necessary to ensure these
+	 * remain valid actions regardless of the member login state.
+	 *
+	 * @var array
+	 * @config 
+	 */
+	private static $allowed_actions = array('dologin', 'logout');
+	
 	/**
 	 * Constructor
 	 *

From 487de0bf5a94247c9070084357a8fc81921a84b1 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Sun, 6 Oct 2013 19:02:46 +0200
Subject: [PATCH 2/2] Renamed "ja_JP" locale to "ja"

Better compat with transifex with generic locale
---
 lang/{ja_JP.yml => ja.yml} | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename lang/{ja_JP.yml => ja.yml} (99%)

diff --git a/lang/ja_JP.yml b/lang/ja.yml
similarity index 99%
rename from lang/ja_JP.yml
rename to lang/ja.yml
index 1a09be7f2..88bdbc2a1 100644
--- a/lang/ja_JP.yml
+++ b/lang/ja.yml
@@ -1,4 +1,4 @@
-ja_JP:
+ja:
   AssetAdmin:
     NEWFOLDER: 新しいフォルダ
   AssetTableField: