From 9b8bc35dbaf3aa0f37885122dccb24d1d7811f1e Mon Sep 17 00:00:00 2001
From: Rick Ellis <rick.ellis@ellislab.com>
Date: Tue, 23 Sep 2008 01:21:23 +0000
Subject:

---
 system/libraries/Form_validation.php | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

(limited to 'system')

diff --git a/system/libraries/Form_validation.php b/system/libraries/Form_validation.php
index f0c1500df..df57f80ff 100644
--- a/system/libraries/Form_validation.php
+++ b/system/libraries/Form_validation.php
@@ -691,20 +691,13 @@ class CI_Form_validation {
 		if (substr($fieldname, 0, 5) == 'lang:')
 		{
 			// Grab the variable
-			$line = substr($fieldname, 5);
-
-			// Translate it
-			$fieldname = $this->CI->lang->line($line);
+			$line = substr($fieldname, 5);			
 			
-			// Were we able to translate the field name?
-			if ($fieldname === FALSE)
+			// Were we able to translate the field name?  If not we use $line
+			if (FALSE === ($fieldname = $this->CI->lang->line($line)))
 			{
 				return $line;
 			}
-			else
-			{
-				return $fieldname;
-			}
 		}
 
 		return $fieldname;
-- 
cgit v1.2.3-24-g4f1b