From 826429cf40a9624788b92d2e6e4b7659e1b0d8a1 Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Mon, 18 Apr 2011 09:40:19 -0500
Subject: Added an optional third parameter to heading() which allows adding
 html attributes to the rendered heading tag.

---
 system/helpers/html_helper.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'system/helpers/html_helper.php')

diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index c6103ab6f..a29204391 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -40,9 +40,10 @@
  */
 if ( ! function_exists('heading'))
 {
-	function heading($data = '', $h = '1')
+	function heading($data = '', $h = '1', $attributes = '')
 	{
-		return "<h".$h.">".$data."</h".$h.">";
+		$attributes = ($attributes != '') ? ' '.$attributes : $attributes;
+		return "<h".$h.$attributes.">".$data."</h".$h.">";
 	}
 }
 
-- 
cgit v1.2.3-24-g4f1b


From 3a746655e92ec59ee7e731c3535673a9aedc5d3e Mon Sep 17 00:00:00 2001
From: Greg Aker <greg.aker@ellislab.com>
Date: Tue, 19 Apr 2011 10:59:47 -0500
Subject: Removing internal references to the EXT constant.  Additionally,
 marked the constant as deprecated.  Use ".php" instead. Also adding upgrade
 notes from 2.0.2 to 2.0.3.

---
 system/helpers/html_helper.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'system/helpers/html_helper.php')

diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index a29204391..080f622dd 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -259,13 +259,13 @@ if ( ! function_exists('doctype'))
 
 		if ( ! is_array($_doctypes))
 		{
-			if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT))
+			if (defined('ENVIRONMENT') AND is_file(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php'))
 			{
-				include(APPPATH.'config/'.ENVIRONMENT.'/doctypes'.EXT);
+				include(APPPATH.'config/'.ENVIRONMENT.'/doctypes.php');
 			}
-			elseif (is_file(APPPATH.'config/doctypes'.EXT))
+			elseif (is_file(APPPATH.'config/doctypes.php'))
 			{
-				include(APPPATH.'config/doctypes'.EXT);
+				include(APPPATH.'config/doctypes.php');
 			}
 
 			if ( ! is_array($_doctypes))
-- 
cgit v1.2.3-24-g4f1b


From 114ab0988e20ac6be39ad363ff897a1a3b85e565 Mon Sep 17 00:00:00 2001
From: Razican <devnull@localhost>
Date: Mon, 25 Apr 2011 17:26:45 +0200
Subject: Fixed double-space typo.

---
 system/helpers/html_helper.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'system/helpers/html_helper.php')

diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index 080f622dd..bd66bc2d0 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -1,4 +1,4 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -30,7 +30,7 @@
 /**
  * Heading
  *
- * Generates an HTML heading tag.  First param is the data.
+ * Generates an HTML heading tag. First param is the data.
  * Second param is the size of the heading tag.
  *
  * @access	public
@@ -114,7 +114,7 @@ if ( ! function_exists('_list'))
 		// Set the indentation based on the depth
 		$out = str_repeat(" ", $depth);
 
-		// Were any attributes submitted?  If so generate a string
+		// Were any attributes submitted? If so generate a string
 		if (is_array($attributes))
 		{
 			$atts = '';
@@ -128,7 +128,7 @@ if ( ! function_exists('_list'))
 		// Write the opening list tag
 		$out .= "<".$type.$attributes.">\n";
 
-		// Cycle through the list elements.  If an array is
+		// Cycle through the list elements. If an array is
 		// encountered we will recursively call _list()
 
 		static $_last_list_item = '';
@@ -244,7 +244,7 @@ if ( ! function_exists('img'))
  * Generates a page document type declaration
  *
  * Valid options are xhtml-11, xhtml-strict, xhtml-trans, xhtml-frame,
- * html4-strict, html4-trans, and html4-frame.  Values are saved in the
+ * html4-strict, html4-trans, and html4-frame. Values are saved in the
  * doctypes config file.
  *
  * @access	public
-- 
cgit v1.2.3-24-g4f1b


From 4b9c62980599228f070b401c7673dce8085b0c61 Mon Sep 17 00:00:00 2001
From: Derek Jones <derek.jones@ellislab.com>
Date: Fri, 1 Jul 2011 17:40:48 -0500
Subject: backed out 648b42a75739, which was a NON-trivial whitespace commit. 
 It broke the Typography class's string replacements, for instance

---
 system/helpers/html_helper.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'system/helpers/html_helper.php')

diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index bd66bc2d0..080f622dd 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
 /**
  * CodeIgniter
  *
@@ -30,7 +30,7 @@
 /**
  * Heading
  *
- * Generates an HTML heading tag. First param is the data.
+ * Generates an HTML heading tag.  First param is the data.
  * Second param is the size of the heading tag.
  *
  * @access	public
@@ -114,7 +114,7 @@ if ( ! function_exists('_list'))
 		// Set the indentation based on the depth
 		$out = str_repeat(" ", $depth);
 
-		// Were any attributes submitted? If so generate a string
+		// Were any attributes submitted?  If so generate a string
 		if (is_array($attributes))
 		{
 			$atts = '';
@@ -128,7 +128,7 @@ if ( ! function_exists('_list'))
 		// Write the opening list tag
 		$out .= "<".$type.$attributes.">\n";
 
-		// Cycle through the list elements. If an array is
+		// Cycle through the list elements.  If an array is
 		// encountered we will recursively call _list()
 
 		static $_last_list_item = '';
@@ -244,7 +244,7 @@ if ( ! function_exists('img'))
  * Generates a page document type declaration
  *
  * Valid options are xhtml-11, xhtml-strict, xhtml-trans, xhtml-frame,
- * html4-strict, html4-trans, and html4-frame. Values are saved in the
+ * html4-strict, html4-trans, and html4-frame.  Values are saved in the
  * doctypes config file.
  *
  * @access	public
-- 
cgit v1.2.3-24-g4f1b


From b13a0dd78f0d0449e3ee9eb350ac06594beb3252 Mon Sep 17 00:00:00 2001
From: Eric Barnes <eric@ericlbarnes.com>
Date: Mon, 18 Jul 2011 00:13:07 -0400
Subject: Fixed issue #199 - Attributes passed as string does not include a
 space between it and the opening tag.

---
 system/helpers/html_helper.php | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'system/helpers/html_helper.php')

diff --git a/system/helpers/html_helper.php b/system/helpers/html_helper.php
index 080f622dd..b64b60650 100644
--- a/system/helpers/html_helper.php
+++ b/system/helpers/html_helper.php
@@ -124,6 +124,10 @@ if ( ! function_exists('_list'))
 			}
 			$attributes = $atts;
 		}
+		elseif (is_string($attributes) AND strlen($attributes) > 0)
+		{
+			$attributes = ' '. $attributes;
+		}
 
 		// Write the opening list tag
 		$out .= "<".$type.$attributes.">\n";
-- 
cgit v1.2.3-24-g4f1b