From 586ff7201c719cac12bd9592350abca101cb0559 Mon Sep 17 00:00:00 2001
From: phpnut <phpnut@cakephp.org>
Date: Mon, 26 Nov 2007 17:51:10 +0000
Subject: [PATCH] "Fixes #3640, Auth component and i18n conflict"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6084 3807eeeb-6ff5-0310-8944-8be069107fe0
---
 cake/libs/controller/components/auth.php | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/cake/libs/controller/components/auth.php b/cake/libs/controller/components/auth.php
index 003c3a0d8..60ece36c7 100644
--- a/cake/libs/controller/components/auth.php
+++ b/cake/libs/controller/components/auth.php
@@ -164,7 +164,7 @@ class AuthComponent extends Object {
  * @var string
  * @access public
  */
-	var $loginError = '';
+	var $loginError = null;
 /**
  * Error to display when user attempts to access an object or action to which they do not have
  * acccess.
@@ -172,7 +172,7 @@ class AuthComponent extends Object {
  * @var string
  * @access public
  */
-	var $authError = '';
+	var $authError = null;
 /**
  * Determines whether AuthComponent will automatically redirect and exit if login is successful.
  *
@@ -226,8 +226,6 @@ class AuthComponent extends Object {
 		$this->params = $controller->params;
 		$crud = array('create', 'read', 'update', 'delete');
 		$this->actionMap = am($this->actionMap, array_combine($crud, $crud));
-		$this->loginError = __('Login failed. Invalid username or password.', true);
-		$this->authError = __('You are not authorized to access that location.', true);
 
 		$admin = Configure::read('Routing.admin');
 		if (!empty($admin)) {
@@ -256,6 +254,14 @@ class AuthComponent extends Object {
  * @access public
  */
 	function startup(&$controller) {
+		if (!$this->loginError) {
+			$this->loginError = __('Login failed. Invalid username or password.', true);
+		}
+
+		if (!$this->authError) {
+			$this->authError = __('You are not authorized to access that location.', true);
+		}
+
 		if (low($controller->name) == 'app' || (low($controller->name) == 'tests' && Configure::read() > 0)) {
 			return;
 		}