Fix a few more merge conflicts
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 44c6f16..f9beff3 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -403,7 +403,7 @@
- :doc:`Config Library <libraries/config>` changes include:
- Changed ``site_url()`` method to accept an array as well.
- - Removed internal method ``_assign_to_config()`` and moved its implementation in *CodeIgniter.php* instead.
+ - Removed internal method ``_assign_to_config()`` and moved its implementation to *CodeIgniter.php* instead.
- :doc:`Security Library <libraries/security>` changes include:
diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index 5bc5887..8ad8f7d 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -47,7 +47,7 @@
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**
@@ -57,9 +57,13 @@
$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::
- <form method="post" accept-charset="utf-8" action="http://example.com/index.php/email/send" class="email" id="myform" />
+ 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">
**Adding Hidden Input Fields**
@@ -69,6 +73,8 @@
$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">
@@ -248,10 +254,10 @@
Example::
$options = array(
- 'small' => 'Small Shirt',
- 'med' => 'Medium Shirt',
- 'large' => 'Large Shirt',
- 'xlarge' => 'Extra Large Shirt',
+ 'small' => 'Small Shirt',
+ 'med' => 'Medium Shirt',
+ 'large' => 'Large Shirt',
+ 'xlarge' => 'Extra Large Shirt',
);
$shirts_on_sale = array('small', 'large');
@@ -389,16 +395,14 @@
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',
- 'checked' => TRUE,
- 'style' => 'margin:10px'
+ 'name' => 'newsletter',
+ 'id' => 'newsletter',
+ 'value' => 'accept',
+ 'checked' => TRUE,
+ 'style' => 'margin:10px'
);
echo form_checkbox($data);
@@ -495,11 +499,11 @@
form to contain::
$data = array(
- 'name' => 'button',
- 'id' => 'button',
- 'value' => 'true',
- 'type' => 'reset',
- 'content' => 'Reset'
+ 'name' => 'button',
+ 'id' => 'button',
+ 'value' => 'true',
+ 'type' => 'reset',
+ 'content' => 'Reset'
);
echo form_button($data);
diff --git a/user_guide_src/source/helpers/smiley_helper.rst b/user_guide_src/source/helpers/smiley_helper.rst
index 7ac91c3..0601f02 100644
--- a/user_guide_src/source/helpers/smiley_helper.rst
+++ b/user_guide_src/source/helpers/smiley_helper.rst
@@ -48,7 +48,7 @@
The Controller
--------------
-In your `application/controllers/` folder, create a file called
+In your **application/controllers/** directory, create a file called
Smileys.php and place the code below in it.
.. important:: Change the URL in the :func:`get_clickable_smileys()`
@@ -75,7 +75,7 @@
}
-In your `application/views/` folder, create a file called `smiley_view.php`
+In your **application/views/** folder, create a file called **smiley_view.php**
and place this code in it::
<html>