From bb8b08982369dd6a2d321844dced488f92134f20 Mon Sep 17 00:00:00 2001
From: vlakoff <vlakoff@gmail.com>
Date: Sun, 28 Jul 2013 22:35:04 +0200
Subject: Polishing Form helper

---
 system/helpers/form_helper.php                |  7 ++++++-
 user_guide_src/source/helpers/form_helper.rst | 26 +++++++++++++++-----------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index 5ba5b556c..146c0f588 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -931,6 +931,11 @@ if ( ! function_exists('_attributes_to_string'))
 	 */
 	function _attributes_to_string($attributes)
 	{
+		if (empty($attributes))
+		{
+			return '';
+		}
+
 		if (is_object($attributes))
 		{
 			$attributes = (array) $attributes;
@@ -950,7 +955,7 @@ if ( ! function_exists('_attributes_to_string'))
 
 		if (is_string($attributes))
 		{
-			return ($attributes === '' ? '' : ' '.$attributes);
+			return ' '.$attributes;
 		}
 
 		return FALSE;
diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index b2a9b6f0f..8f7515788 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -22,7 +22,7 @@ form_open()
 .. php:function:: form_open($action = '', $attributes = '', $hidden = array())
 
 	:param	string	$action: Form action/target URI string
-	:param	string	$attributes: HTML attributes
+	:param	array	$attributes: HTML attributes
 	:param	array	$hidden: An array of hidden fields' definitions
 	:returns:	string
 
@@ -41,7 +41,7 @@ Here's a simple example::
 The above example would create a form that points to your base URL plus the
 "email/send" URI segments, like this::
 
-	<form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send" />
+	<form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send">
 
 Adding Attributes
 ^^^^^^^^^^^^^^^^^
@@ -52,9 +52,13 @@ parameter, like this::
 	$attributes = array('class' => 'email', 'id' => 'myform');
 	echo form_open('email/send', $attributes);
 
-The above example would create a form similar to this::
+Alternatively, you can specify the second parameter as a string::
+
+	echo form_open('email/send', 'class="email" id="myform"');
+
+The above examples would create a form similar to this::
 
-	<form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send" class="email" id="myform" />
+	<form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send" class="email" id="myform">
 
 Adding Hidden Input Fields
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -65,6 +69,8 @@ third parameter, like this::
 	$hidden = array('username' => 'Joe', 'member_id' => '234');
 	echo form_open('email/send', '', $hidden);
 
+You can skip the second parameter by passing any falsy value to it.
+
 The above example would create a form similar to this::
 
 	<form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send">
@@ -77,7 +83,7 @@ form_open_multipart()
 .. php:function:: form_open_multipart($action = '', $attributes = array(), $hidden = array())
 
 	:param	string	$action: Form action/target URI string
-	:param	string	$attributes: HTML attributes
+	:param	array	$attributes: HTML attributes
 	:param	array	$hidden: An array of hidden fields' definitions
 	:returns:	string
 
@@ -407,16 +413,14 @@ The third parameter contains a boolean TRUE/FALSE to determine whether
 the box should be checked or not.
 
 Similar to the other form functions in this helper, you can also pass an
-array of attributes to the function
-
-::
+array of attributes to the function::
 
 	$data = array(
 		'name'    => 'newsletter',
-		'id'      => 'newsletter',
-		'value'   => 'accept',
+		'id'      => 'newsletter',
+		'value'   => 'accept',
 		'checked' => TRUE,
-		'style'   => 'margin:10px'
+		'style'   => 'margin:10px'
 	);
 
 	echo form_checkbox($data);
-- 
cgit v1.2.3-24-g4f1b