From cc1be0f6fbf032896b5b1f6373cb247df648f6c8 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 27 Jun 2008 17:14:46 +0000
Subject: Moved the <label> output ability from the language library to a
 language helper (hotfix for 1.6.3)

---
 system/helpers/language_helper.php | 58 ++++++++++++++++++++++++++++++++++++++
 system/libraries/Language.php      |  9 +-----
 2 files changed, 59 insertions(+), 8 deletions(-)
 create mode 100644 system/helpers/language_helper.php

(limited to 'system')

diff --git a/system/helpers/language_helper.php b/system/helpers/language_helper.php
new file mode 100644
index 000000000..b065ebeb6
--- /dev/null
+++ b/system/helpers/language_helper.php
@@ -0,0 +1,58 @@
+<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
+/**
+ * CodeIgniter
+ *
+ * An open source application development framework for PHP 4.3.2 or newer
+ *
+ * @package		CodeIgniter
+ * @author		ExpressionEngine Dev Team
+ * @copyright	Copyright (c) 2006, EllisLab, Inc.
+ * @license		http://codeigniter.com/user_guide/license.html
+ * @link		http://codeigniter.com
+ * @since		Version 1.0
+ * @filesource
+ */
+
+// ------------------------------------------------------------------------
+
+/**
+ * CodeIgniter Language Helpers
+ *
+ * @package		CodeIgniter
+ * @subpackage	Helpers
+ * @category	Helpers
+ * @author		ExpressionEngine Dev Team
+ * @link		http://codeigniter.com/user_guide/helpers/language_helper.html
+ */
+
+// ------------------------------------------------------------------------
+
+/**
+ * Lang
+ *
+ * Fetches a language variable and optionally outputs a form label
+ *
+ * @access	public
+ * @param	string	the language line
+ * @param	string	the id of the form element
+ * @return	string
+ */	
+if ( ! function_exists('lang'))
+{
+	function lang($line, $id = '')
+	{
+		$CI =& get_instance();
+		$line = $CI->lang->line($line);
+
+		if ($id != '')
+		{
+			$line = '<label for="'.$id.'">'.$line."</label>";
+		}
+
+		return $line;
+	}
+}
+
+// ------------------------------------------------------------------------
+/* End of file language_helper.php */
+/* Location: ./system/helpers/language_helper.php */
\ No newline at end of file
diff --git a/system/libraries/Language.php b/system/libraries/Language.php
index a1f73d03b..be86c2b89 100644
--- a/system/libraries/Language.php
+++ b/system/libraries/Language.php
@@ -109,18 +109,11 @@ class CI_Language {
 	 *
 	 * @access	public
 	 * @param	string	$line 	the language line
-	 * @param	string	$label 	optional label 
 	 * @return	string
 	 */
-	function line($line = '', $label = '')
+	function line($line = '')
 	{
 		$line = ($line == '' OR ! isset($this->language[$line])) ? FALSE : $this->language[$line];
-		
-		if ($label != '')
-		{
-			$line = '<label for="'.$label.'">'.$line."</label>";
-		}
-		
 		return $line;
 	}
 
-- 
cgit v1.2.3-24-g4f1b