From 664d25a2286b5fdef740da7a3c4d72d8fa00d530 Mon Sep 17 00:00:00 2001
From: Adam Jackett <adam@darkhouse.ca>
Date: Wed, 3 Jun 2015 15:54:54 -0400
Subject: made all form helpers consistent regarding extra attributes

---
 user_guide_src/source/helpers/form_helper.rst | 37 +++++++++++++++++++--------
 1 file changed, 26 insertions(+), 11 deletions(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index 9ddca89bc..781e81f96 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -191,7 +191,7 @@ The following functions are available:
 
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
-	:param	string	$extra: Extra attributes to be added to the tag *as is*
+	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
 	:returns:	An HTML text input field tag
 	:rtype:	string
 
@@ -226,11 +226,16 @@ The following functions are available:
 		$js = 'onClick="some_function()"';
 		echo form_input('username', 'johndoe', $js);
 
+	Or you can pass it as an array::
+
+		$js = array('onClick' => "some_function()");
+		echo form_input('username', 'johndoe', $js);
+
 .. php:function:: form_password([$data = ''[, $value = ''[, $extra = '']]])
 
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
-	:param	string	$extra: Extra attributes to be added to the tag *as is*
+	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
 	:returns:	An HTML password input field tag
 	:rtype:	string
 
@@ -242,7 +247,7 @@ The following functions are available:
 
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
-	:param	string	$extra: Extra attributes to be added to the tag *as is*
+	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
 	:returns:	An HTML file upload input field tag
 	:rtype:	string
 
@@ -255,7 +260,7 @@ The following functions are available:
 
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
-	:param	string	$extra: Extra attributes to be added to the tag *as is*
+	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
 	:returns:	An HTML textarea tag
 	:rtype:	string
 
@@ -270,7 +275,7 @@ The following functions are available:
 	:param	string	$name: Field name
 	:param	array	$options: An associative array of options to be listed
 	:param	array	$selected: List of fields to mark with the *selected* attribute
-	:param	string	$extra: Extra attributes to be added to the tag *as is*
+	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
 	:returns:	An HTML dropdown select field tag
 	:rtype:	string
 
@@ -324,6 +329,11 @@ The following functions are available:
 		$js = 'id="shirts" onChange="some_function();"';
 		echo form_dropdown('shirts', $options, 'large', $js);
 
+	Or you can pass it as an array::
+
+		$js = array('id' => "shirts", 'onChange' => "some_function();");
+		echo form_dropdown('shirts', $options, 'large', $js);
+
 	If the array passed as ``$options`` is a multidimensional array, then
 	``form_dropdown()`` will produce an <optgroup> with the array key as the
 	label.
@@ -334,7 +344,7 @@ The following functions are available:
 	:param	string	$name: Field name
 	:param	array	$options: An associative array of options to be listed
 	:param	array	$selected: List of fields to mark with the *selected* attribute
-	:param	string	$extra: Extra attributes to be added to the tag *as is*
+	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
 	:returns:	An HTML dropdown multiselect field tag
 	:rtype:	string
 
@@ -417,7 +427,7 @@ The following functions are available:
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
 	:param	bool	$checked: Whether to mark the checkbox as being *checked*
-	:param	string	$extra: Extra attributes to be added to the tag *as is*
+	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
 	:returns:	An HTML checkbox input tag
 	:rtype:	string
 
@@ -450,13 +460,18 @@ The following functions are available:
 		$js = 'onClick="some_function()"';
 		echo form_checkbox('newsletter', 'accept', TRUE, $js)
 
+	Or you can pass it as an array::
+
+		$js = array('onClick' => "some_function()");
+		echo form_checkbox('newsletter', 'accept', TRUE, $js)
+
 
 .. php:function:: form_radio([$data = ''[, $value = ''[, $checked = FALSE[, $extra = '']]]])
 
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
 	:param	bool	$checked: Whether to mark the radio button as being *checked*
-	:param	string	$extra: Extra attributes to be added to the tag *as is*
+	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
 	:returns:	An HTML radio input tag
 	:rtype:	string
 
@@ -495,7 +510,7 @@ The following functions are available:
 
 	:param	string	$data: Button name
 	:param	string	$value: Button value
-	:param	string	$extra: Extra attributes to be added to the tag *as is*
+	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
 	:returns:	An HTML input submit tag
 	:rtype:	string
 
@@ -513,7 +528,7 @@ The following functions are available:
 
 	:param	string	$data: Button name
 	:param	string	$value: Button value
-	:param	string	$extra: Extra attributes to be added to the tag *as is*
+	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
 	:returns:	An HTML input reset button tag
 	:rtype:	string
 
@@ -525,7 +540,7 @@ The following functions are available:
 
 	:param	string	$data: Button name
 	:param	string	$content: Button label
-	:param	string	$extra: Extra attributes to be added to the tag *as is*
+	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
 	:returns:	An HTML button tag
 	:rtype:	string
 
-- 
cgit v1.2.3-24-g4f1b


From c09ab9d2b31a6c1d60a8db3970dd56feceee9415 Mon Sep 17 00:00:00 2001
From: Tim Nolte <noltet@sekisui-spi.com>
Date: Mon, 8 Jun 2015 10:40:26 -0400
Subject: Fixed missing MySQLi driver parameter DOCBLOCK descriptions. Updated
 database configuration documentation to include a list of the new MySQLi
 driver parameters.

Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
---
 user_guide_src/source/database/configuration.rst | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index d21c79e44..1d10bc1a6 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -186,10 +186,17 @@ Explanation of Values:
 			::
 
 				$db['default']['port'] = 5432;
+
+**db_options**		Used to set various database connections options and values. (MySQLi only)
+**ssl_key**		The path name to the key file. (MySQLi only)
+**ssl_cert**		The path name to the certificate file. (MySQLi only)
+**ssl_ca**		The path name to the certificate authority file. (MySQLi only)
+**ssl_capath**		The pathname to a directory that contains trusted SSL CA certificates in PEM format. (MySQLi only)
+**ssl_cipher**		A list of allowable ciphers to use for SSL encryption. (MySQLi only)
 ======================  ==================================================================================================
 
 .. note:: Depending on what database platform you are using (MySQL, PostgreSQL,
 	etc.) not all values will be needed. For example, when using SQLite you
 	will not need to supply a username or password, and the database name
 	will be the path to your database file. The information above assumes
-	you are using MySQL.
\ No newline at end of file
+	you are using MySQL.
-- 
cgit v1.2.3-24-g4f1b


From 2ac4177b4b6afc63d594523416c3991d23dddf20 Mon Sep 17 00:00:00 2001
From: Tim Nolte <noltet@sekisui-spi.com>
Date: Mon, 8 Jun 2015 11:02:56 -0400
Subject: Added new MySQLi parameters/info to default database config file.
 Fixed missing new MySQLi parameters from database configuration documentation
 examples.

Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
---
 user_guide_src/source/database/configuration.rst | 28 ++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index 1d10bc1a6..510037dba 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -30,6 +30,12 @@ prototype::
 		'encrypt' => FALSE,
 		'compress' => FALSE,
 		'stricton' => FALSE,
+		'db_options' => array(),
+		'ssl_key' => '',
+		'ssl_cert' => '',
+		'ssl_ca' => '',
+		'ssl_capath' => '',
+		'ssl_cipher' => '',
 		'failover' => array()
 	);
 
@@ -71,7 +77,13 @@ These failovers can be specified by setting the failover for a connection like t
 				'swap_pre' => '',
 				'encrypt' => FALSE,
 				'compress' => FALSE,
-				'stricton' => FALSE
+				'stricton' => FALSE,
+				'db_options' => array(),
+				'ssl_key' => '',
+				'ssl_cert' => '',
+				'ssl_ca' => '',
+				'ssl_capath' => '',
+				'ssl_cipher' => ''
 			),
 			array(
 				'hostname' => 'localhost2',
@@ -89,7 +101,13 @@ These failovers can be specified by setting the failover for a connection like t
 				'swap_pre' => '',
 				'encrypt' => FALSE,
 				'compress' => FALSE,
-				'stricton' => FALSE
+				'stricton' => FALSE,
+				'db_options' => array(),
+				'ssl_key' => '',
+				'ssl_cert' => '',
+				'ssl_ca' => '',
+				'ssl_capath' => '',
+				'ssl_cipher' => ''
 			)
 		);
 
@@ -120,6 +138,12 @@ example, to set up a "test" environment you would do this::
 		'compress' => FALSE,
 		'encrypt' => FALSE,
 		'stricton' => FALSE,
+		'db_options' => array(),
+		'ssl_key' => '',
+		'ssl_cert' => '',
+		'ssl_ca' => '',
+		'ssl_capath' => '',
+		'ssl_cipher' => '',
 		'failover' => array()
 	);
 
-- 
cgit v1.2.3-24-g4f1b


From 0c75c8219e42cf629036f73944901bd9f1f286bf Mon Sep 17 00:00:00 2001
From: Adam Jackett <adam@darkhouse.ca>
Date: Wed, 17 Jun 2015 10:42:23 -0400
Subject: removed unnecessary change to form_radio, updated docs and added
 changelog entry

---
 user_guide_src/source/changelog.rst           | 12 +++++++++---
 user_guide_src/source/helpers/form_helper.rst | 22 +++++++++++-----------
 2 files changed, 20 insertions(+), 14 deletions(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5c2c4d944..ee1e36521 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -8,13 +8,19 @@ Version 3.0.1
 Release Date: Not Released
 
 -  Core
-
+   
    -  Added DoS mitigation to :php:func:`hash_pbkdf2()` :doc:`compatibility function <general/compatibility_functions>`.
 
-- Database
-
+-  Database
+   
    -  Added ``list_fields()`` support for SQLite ('sqlite3' and 'pdo_sqlite' drivers).
 
+-  Helpers
+   
+   -  :doc:`Form Helper <helpers/form_helper>` changes include:
+
+      -  Made all form helpers consistent by allowing an array to be passed for extra attributes.
+
 Bug fixes for 3.0.1
 -------------------
 
diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index 781e81f96..1c55f5692 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -191,7 +191,7 @@ The following functions are available:
 
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
-	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
 	:returns:	An HTML text input field tag
 	:rtype:	string
 
@@ -235,7 +235,7 @@ The following functions are available:
 
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
-	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
 	:returns:	An HTML password input field tag
 	:rtype:	string
 
@@ -247,7 +247,7 @@ The following functions are available:
 
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
-	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
 	:returns:	An HTML file upload input field tag
 	:rtype:	string
 
@@ -260,7 +260,7 @@ The following functions are available:
 
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
-	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
 	:returns:	An HTML textarea tag
 	:rtype:	string
 
@@ -275,7 +275,7 @@ The following functions are available:
 	:param	string	$name: Field name
 	:param	array	$options: An associative array of options to be listed
 	:param	array	$selected: List of fields to mark with the *selected* attribute
-	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
 	:returns:	An HTML dropdown select field tag
 	:rtype:	string
 
@@ -344,7 +344,7 @@ The following functions are available:
 	:param	string	$name: Field name
 	:param	array	$options: An associative array of options to be listed
 	:param	array	$selected: List of fields to mark with the *selected* attribute
-	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
 	:returns:	An HTML dropdown multiselect field tag
 	:rtype:	string
 
@@ -427,7 +427,7 @@ The following functions are available:
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
 	:param	bool	$checked: Whether to mark the checkbox as being *checked*
-	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
 	:returns:	An HTML checkbox input tag
 	:rtype:	string
 
@@ -471,7 +471,7 @@ The following functions are available:
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
 	:param	bool	$checked: Whether to mark the radio button as being *checked*
-	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
 	:returns:	An HTML radio input tag
 	:rtype:	string
 
@@ -510,7 +510,7 @@ The following functions are available:
 
 	:param	string	$data: Button name
 	:param	string	$value: Button value
-	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
 	:returns:	An HTML input submit tag
 	:rtype:	string
 
@@ -528,7 +528,7 @@ The following functions are available:
 
 	:param	string	$data: Button name
 	:param	string	$value: Button value
-	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
 	:returns:	An HTML input reset button tag
 	:rtype:	string
 
@@ -540,7 +540,7 @@ The following functions are available:
 
 	:param	string	$data: Button name
 	:param	string	$content: Button label
-	:param	mixed	$extra: Extra attributes to be added to the tag *as is* either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
 	:returns:	An HTML button tag
 	:rtype:	string
 
-- 
cgit v1.2.3-24-g4f1b


From ced557b99cec159a3ad36e497819b8da7f70cd1e Mon Sep 17 00:00:00 2001
From: Tim Nolte <noltet@sekisui-spi.com>
Date: Thu, 18 Jun 2015 15:28:43 -0400
Subject: Removed db_options configuration item for implementation later.
 Changed 5 new MySQLi SSL configuration options to a single ssl_options config
 item that is an array that will be read to set the individual SSL options.

Signed-off-by: Tim Nolte <noltet@sekisui-spi.com>
---
 user_guide_src/source/database/configuration.rst | 35 ++++--------------------
 1 file changed, 5 insertions(+), 30 deletions(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index 510037dba..6f1726ef6 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -30,12 +30,7 @@ prototype::
 		'encrypt' => FALSE,
 		'compress' => FALSE,
 		'stricton' => FALSE,
-		'db_options' => array(),
-		'ssl_key' => '',
-		'ssl_cert' => '',
-		'ssl_ca' => '',
-		'ssl_capath' => '',
-		'ssl_cipher' => '',
+		'ssl_options' => array(),
 		'failover' => array()
 	);
 
@@ -78,12 +73,7 @@ These failovers can be specified by setting the failover for a connection like t
 				'encrypt' => FALSE,
 				'compress' => FALSE,
 				'stricton' => FALSE,
-				'db_options' => array(),
-				'ssl_key' => '',
-				'ssl_cert' => '',
-				'ssl_ca' => '',
-				'ssl_capath' => '',
-				'ssl_cipher' => ''
+				'ssl_options' => array()
 			),
 			array(
 				'hostname' => 'localhost2',
@@ -102,12 +92,7 @@ These failovers can be specified by setting the failover for a connection like t
 				'encrypt' => FALSE,
 				'compress' => FALSE,
 				'stricton' => FALSE,
-				'db_options' => array(),
-				'ssl_key' => '',
-				'ssl_cert' => '',
-				'ssl_ca' => '',
-				'ssl_capath' => '',
-				'ssl_cipher' => ''
+				'ssl_options' => array()
 			)
 		);
 
@@ -138,12 +123,7 @@ example, to set up a "test" environment you would do this::
 		'compress' => FALSE,
 		'encrypt' => FALSE,
 		'stricton' => FALSE,
-		'db_options' => array(),
-		'ssl_key' => '',
-		'ssl_cert' => '',
-		'ssl_ca' => '',
-		'ssl_capath' => '',
-		'ssl_cipher' => '',
+		'ssl_options' => array(),
 		'failover' => array()
 	);
 
@@ -211,12 +191,7 @@ Explanation of Values:
 
 				$db['default']['port'] = 5432;
 
-**db_options**		Used to set various database connections options and values. (MySQLi only)
-**ssl_key**		The path name to the key file. (MySQLi only)
-**ssl_cert**		The path name to the certificate file. (MySQLi only)
-**ssl_ca**		The path name to the certificate authority file. (MySQLi only)
-**ssl_capath**		The pathname to a directory that contains trusted SSL CA certificates in PEM format. (MySQLi only)
-**ssl_cipher**		A list of allowable ciphers to use for SSL encryption. (MySQLi only)
+**ssl_options**		Used to set various SSL connection options and values.
 ======================  ==================================================================================================
 
 .. note:: Depending on what database platform you are using (MySQL, PostgreSQL,
-- 
cgit v1.2.3-24-g4f1b


From 59a253d0776275994af0fda9ad729abb8607b4d5 Mon Sep 17 00:00:00 2001
From: ftwbzhao <b.zhao1@gmail.com>
Date: Sat, 4 Jul 2015 17:55:38 +0800
Subject: add changelog

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index edbcf2f6a..1fe6e9e09 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -46,6 +46,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3913) - :doc:`Cache Library <libraries/caching>` didn't work with the direct ``$this->cache->$driver_name->method()`` syntax with Redis and Memcache(d).
 -  Fixed a bug (#3932) - :doc:`Query Builder <database/query_builder>` didn't properly compile WHERE and HAVING conditions for field names that end with "and", "or".
 -  Fixed a bug in :doc:`Query Builder <database/query_builder>` where ``delete()`` didn't properly work on multiple tables with a WHERE condition previously set via ``where()``.
+-  Fixed a bug (#3952) - ``list_fields()`` didn't work properly with the SQlite ('sqlite3' driver).
 
 Version 3.0.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 820f06f63de3da890a87a88161daea0fd1be8caa Mon Sep 17 00:00:00 2001
From: ftwbzhao <b.zhao1@gmail.com>
Date: Sun, 5 Jul 2015 21:25:32 +0800
Subject: fix pdo/sqlite & update changelog

---
 user_guide_src/source/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1fe6e9e09..3cd24c450 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -46,7 +46,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3913) - :doc:`Cache Library <libraries/caching>` didn't work with the direct ``$this->cache->$driver_name->method()`` syntax with Redis and Memcache(d).
 -  Fixed a bug (#3932) - :doc:`Query Builder <database/query_builder>` didn't properly compile WHERE and HAVING conditions for field names that end with "and", "or".
 -  Fixed a bug in :doc:`Query Builder <database/query_builder>` where ``delete()`` didn't properly work on multiple tables with a WHERE condition previously set via ``where()``.
--  Fixed a bug (#3952) - ``list_fields()`` didn't work properly with the SQlite ('sqlite3' driver).
+-  Fixed a bug (#3952) - :doc:`Database <database/index>` method ``list_fields()`` didn't work with SQLite3.
 
 Version 3.0.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From a5ea5066e4463a3857d6add2c5e2bc6833d1cbc0 Mon Sep 17 00:00:00 2001
From: ftwbzhao <b.zhao1@gmail.com>
Date: Mon, 6 Jul 2015 13:18:11 +0800
Subject: Added "is_resource" into the list of unit tests capable of being run.

---
 user_guide_src/source/libraries/unit_testing.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/libraries/unit_testing.rst b/user_guide_src/source/libraries/unit_testing.rst
index 026781cb7..57934cba3 100644
--- a/user_guide_src/source/libraries/unit_testing.rst
+++ b/user_guide_src/source/libraries/unit_testing.rst
@@ -76,6 +76,7 @@ result. Here is a list of allowed comparison types:
 -  is_double
 -  is_array
 -  is_null
+-  is_resource
 
 Generating Reports
 ==================
-- 
cgit v1.2.3-24-g4f1b


From 15c42483c744da24525ae87be4654483657cb2ed Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 6 Jul 2015 11:19:30 +0300
Subject: [ci skip] Add missing changelog entries for PRs #3955, #3957

---
 user_guide_src/source/changelog.rst | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index edbcf2f6a..432d65e00 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -23,6 +23,8 @@ Release Date: Not Released
       - Errors "no_file_selected", "file_partial", "stopped_by_extension", "no_file_types", "invalid_filetype", "bad_filename" are now logged at the 'debug' level.
       - Errors "file_exceeds_limit", "file_exceeds_form_limit", "invalid_filesize", "invalid_dimensions" are now logged at the 'info' level.
 
+   -  Added 'is_resource' to the available expectations in :doc:`Unit Testing Library <libraries/unit_testing>`.
+
 
 Bug fixes for 3.0.1
 -------------------
@@ -46,6 +48,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3913) - :doc:`Cache Library <libraries/caching>` didn't work with the direct ``$this->cache->$driver_name->method()`` syntax with Redis and Memcache(d).
 -  Fixed a bug (#3932) - :doc:`Query Builder <database/query_builder>` didn't properly compile WHERE and HAVING conditions for field names that end with "and", "or".
 -  Fixed a bug in :doc:`Query Builder <database/query_builder>` where ``delete()`` didn't properly work on multiple tables with a WHERE condition previously set via ``where()``.
+-  Fixed a bug (#3955) - :doc:`Cache Library <libraries/caching>` methods ``increment()`` and ``decrement()`` ignored the 'key_prefix' setting.
 
 Version 3.0.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 7018d892512af76043c5843f663da76a7ed08cb7 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 8 Jul 2015 17:57:52 +0300
Subject: Fix #3963

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 92d8bb164..63080a684 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -50,6 +50,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug in :doc:`Query Builder <database/query_builder>` where ``delete()`` didn't properly work on multiple tables with a WHERE condition previously set via ``where()``.
 -  Fixed a bug (#3952) - :doc:`Database <database/index>` method ``list_fields()`` didn't work with SQLite3.
 -  Fixed a bug (#3955) - :doc:`Cache Library <libraries/caching>` methods ``increment()`` and ``decrement()`` ignored the 'key_prefix' setting.
+-  Fixed a bug (#3963) - :doc:`Unit Testing Library <libraries/unit_testing>` wrongly tried to translate filenames, line numbers and notes values in test results.
 
 Version 3.0.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 91da5d1cc0f339f94922e48bdcce1bace602713a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 9 Jul 2015 15:14:35 +0300
Subject: Fix #3965

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 63080a684..8457d8f65 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -51,6 +51,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3952) - :doc:`Database <database/index>` method ``list_fields()`` didn't work with SQLite3.
 -  Fixed a bug (#3955) - :doc:`Cache Library <libraries/caching>` methods ``increment()`` and ``decrement()`` ignored the 'key_prefix' setting.
 -  Fixed a bug (#3963) - :doc:`Unit Testing Library <libraries/unit_testing>` wrongly tried to translate filenames, line numbers and notes values in test results.
+-  Fixed a bug (#3965) - :doc:`File Uploading Library <libraries/file_uploading>` ignored the "encrypt_name" setting when "overwrite" is enabled.
 
 Version 3.0.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 00cdb810c54c57f2e07c248b0858b7cfe6d53bfd Mon Sep 17 00:00:00 2001
From: Adrian Voicu <avenir.ro@gmail.com>
Date: Fri, 10 Jul 2015 17:04:00 +0300
Subject: Important note

If you pass strings to the add_field() methods you won't be able to follow those by add_key() methods on those fields.
---
 user_guide_src/source/database/forge.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/database/forge.rst b/user_guide_src/source/database/forge.rst
index a875f7418..a98cdb012 100644
--- a/user_guide_src/source/database/forge.rst
+++ b/user_guide_src/source/database/forge.rst
@@ -143,6 +143,8 @@ string into the field definitions with add_field()
 	$this->dbforge->add_field("label varchar(100) NOT NULL DEFAULT 'default label'");
 
 
+.. note:: Passing strings as fields won't allow you to follow these calls by a add_key() call.
+
 .. note:: Multiple calls to add_field() are cumulative.
 
 Creating an id field
-- 
cgit v1.2.3-24-g4f1b


From 1fb0cfee53f4424b5f9ca09f734501a942ece9d5 Mon Sep 17 00:00:00 2001
From: Adrian Voicu <avenir.ro@gmail.com>
Date: Mon, 13 Jul 2015 11:36:15 +0300
Subject: Update forge.rst

---
 user_guide_src/source/database/forge.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/database/forge.rst b/user_guide_src/source/database/forge.rst
index a98cdb012..a8a346eb4 100644
--- a/user_guide_src/source/database/forge.rst
+++ b/user_guide_src/source/database/forge.rst
@@ -143,7 +143,7 @@ string into the field definitions with add_field()
 	$this->dbforge->add_field("label varchar(100) NOT NULL DEFAULT 'default label'");
 
 
-.. note:: Passing strings as fields won't allow you to follow these calls by a add_key() call.
+..note:: Passing raw strings as fields cannot be followed by ``add_key()`` calls on those fields.
 
 .. note:: Multiple calls to add_field() are cumulative.
 
-- 
cgit v1.2.3-24-g4f1b


From ff50c54266bbd484dd5fb2887974abb69a141817 Mon Sep 17 00:00:00 2001
From: Adrian Voicu <avenir.ro@gmail.com>
Date: Mon, 13 Jul 2015 11:55:51 +0300
Subject: Update forge.rst

---
 user_guide_src/source/database/forge.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/database/forge.rst b/user_guide_src/source/database/forge.rst
index a8a346eb4..646e3a56e 100644
--- a/user_guide_src/source/database/forge.rst
+++ b/user_guide_src/source/database/forge.rst
@@ -143,7 +143,7 @@ string into the field definitions with add_field()
 	$this->dbforge->add_field("label varchar(100) NOT NULL DEFAULT 'default label'");
 
 
-..note:: Passing raw strings as fields cannot be followed by ``add_key()`` calls on those fields.
+.. note:: Passing raw strings as fields cannot be followed by ``add_key()`` calls on those fields.
 
 .. note:: Multiple calls to add_field() are cumulative.
 
-- 
cgit v1.2.3-24-g4f1b


From 1dfc20da1d2f30f086f9489393141491ccfeed4c Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 15 Jul 2015 15:30:01 +0300
Subject: [ci skip] Changelog entry for PR #3970

---
 user_guide_src/source/changelog.rst | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8457d8f65..d431d49ca 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -25,6 +25,9 @@ Release Date: Not Released
 
    -  Added 'is_resource' to the available expectations in :doc:`Unit Testing Library <libraries/unit_testing>`.
 
+-  Helpers
+
+   -  Added Unicode support to :doc:`URL Helper <helpers/url_helper>` function :php:func:`url_title()`.
 
 Bug fixes for 3.0.1
 -------------------
-- 
cgit v1.2.3-24-g4f1b


From 8fda540b0d3098ec882b36d1c2492db0ee5031f0 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 15 Jul 2015 15:48:37 +0300
Subject: [ci skip] Add changelog entry for PR #3968

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d431d49ca..b7888ca23 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -55,6 +55,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3955) - :doc:`Cache Library <libraries/caching>` methods ``increment()`` and ``decrement()`` ignored the 'key_prefix' setting.
 -  Fixed a bug (#3963) - :doc:`Unit Testing Library <libraries/unit_testing>` wrongly tried to translate filenames, line numbers and notes values in test results.
 -  Fixed a bug (#3965) - :doc:`File Uploading Library <libraries/file_uploading>` ignored the "encrypt_name" setting when "overwrite" is enabled.
+-  Fixed a bug (#3968) - :doc:`Database Forge <database/forge>` method ``add_key()`` didn't treat array inputs as composite keys unless it's a PRIMARY KEY.
 
 Version 3.0.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From c19f3b2596ae846f5de73f562a0288af8c82855a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 15 Jul 2015 16:41:06 +0300
Subject: Polish changes from PR #3893

---
 user_guide_src/source/changelog.rst           |  2 +-
 user_guide_src/source/helpers/form_helper.rst | 31 +++++++++++++++------------
 2 files changed, 18 insertions(+), 15 deletions(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4fe3b94ff..55463edc2 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -8,7 +8,7 @@ Version 3.0.1
 Release Date: Not Released
 
 -  Core
-   
+
    -  Added DoS mitigation to :php:func:`hash_pbkdf2()` :doc:`compatibility function <general/compatibility_functions>`.
 
 -  Database
diff --git a/user_guide_src/source/helpers/form_helper.rst b/user_guide_src/source/helpers/form_helper.rst
index 1c55f5692..6317f08ed 100644
--- a/user_guide_src/source/helpers/form_helper.rst
+++ b/user_guide_src/source/helpers/form_helper.rst
@@ -191,7 +191,7 @@ The following functions are available:
 
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
-	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
 	:returns:	An HTML text input field tag
 	:rtype:	string
 
@@ -228,14 +228,14 @@ The following functions are available:
 
 	Or you can pass it as an array::
 
-		$js = array('onClick' => "some_function()");
+		$js = array('onClick' => 'some_function();');
 		echo form_input('username', 'johndoe', $js);
 
 .. php:function:: form_password([$data = ''[, $value = ''[, $extra = '']]])
 
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
-	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
 	:returns:	An HTML password input field tag
 	:rtype:	string
 
@@ -247,7 +247,7 @@ The following functions are available:
 
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
-	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
 	:returns:	An HTML file upload input field tag
 	:rtype:	string
 
@@ -260,7 +260,7 @@ The following functions are available:
 
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
-	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
 	:returns:	An HTML textarea tag
 	:rtype:	string
 
@@ -275,7 +275,7 @@ The following functions are available:
 	:param	string	$name: Field name
 	:param	array	$options: An associative array of options to be listed
 	:param	array	$selected: List of fields to mark with the *selected* attribute
-	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
 	:returns:	An HTML dropdown select field tag
 	:rtype:	string
 
@@ -331,7 +331,10 @@ The following functions are available:
 
 	Or you can pass it as an array::
 
-		$js = array('id' => "shirts", 'onChange' => "some_function();");
+		$js = array(
+			'id'       => 'shirts',
+			'onChange' => 'some_function();'
+		);
 		echo form_dropdown('shirts', $options, 'large', $js);
 
 	If the array passed as ``$options`` is a multidimensional array, then
@@ -344,7 +347,7 @@ The following functions are available:
 	:param	string	$name: Field name
 	:param	array	$options: An associative array of options to be listed
 	:param	array	$selected: List of fields to mark with the *selected* attribute
-	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
 	:returns:	An HTML dropdown multiselect field tag
 	:rtype:	string
 
@@ -427,7 +430,7 @@ The following functions are available:
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
 	:param	bool	$checked: Whether to mark the checkbox as being *checked*
-	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
 	:returns:	An HTML checkbox input tag
 	:rtype:	string
 
@@ -462,7 +465,7 @@ The following functions are available:
 
 	Or you can pass it as an array::
 
-		$js = array('onClick' => "some_function()");
+		$js = array('onClick' => 'some_function();');
 		echo form_checkbox('newsletter', 'accept', TRUE, $js)
 
 
@@ -471,7 +474,7 @@ The following functions are available:
 	:param	array	$data: Field attributes data
 	:param	string	$value: Field value
 	:param	bool	$checked: Whether to mark the radio button as being *checked*
-	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
 	:returns:	An HTML radio input tag
 	:rtype:	string
 
@@ -510,7 +513,7 @@ The following functions are available:
 
 	:param	string	$data: Button name
 	:param	string	$value: Button value
-	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
 	:returns:	An HTML input submit tag
 	:rtype:	string
 
@@ -528,7 +531,7 @@ The following functions are available:
 
 	:param	string	$data: Button name
 	:param	string	$value: Button value
-	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
 	:returns:	An HTML input reset button tag
 	:rtype:	string
 
@@ -540,7 +543,7 @@ The following functions are available:
 
 	:param	string	$data: Button name
 	:param	string	$content: Button label
-	:param	mixed	$extra: Extra attributes to be added to the tag either as array or string
+	:param	mixed	$extra: Extra attributes to be added to the tag either as an array or a literal string
 	:returns:	An HTML button tag
 	:rtype:	string
 
-- 
cgit v1.2.3-24-g4f1b


From 63c34f2774440c5de77429cb613a4dda268f4dd9 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 15 Jul 2015 17:13:34 +0300
Subject: [ci skip] Add a changelog entry for PR #3715

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 55463edc2..3a1804835 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -57,6 +57,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3963) - :doc:`Unit Testing Library <libraries/unit_testing>` wrongly tried to translate filenames, line numbers and notes values in test results.
 -  Fixed a bug (#3965) - :doc:`File Uploading Library <libraries/file_uploading>` ignored the "encrypt_name" setting when "overwrite" is enabled.
 -  Fixed a bug (#3968) - :doc:`Database Forge <database/forge>` method ``add_key()`` didn't treat array inputs as composite keys unless it's a PRIMARY KEY.
+-  Fixed a bug (#3715) - :doc:`Pagination Library <libraries/pagination>` could generate broken link when a protocol-relative base URL is used.
 
 Version 3.0.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 4a4cbb376b1d17a9e74edad8f7cb7f27a50c01c7 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 15 Jul 2015 17:39:44 +0300
Subject: [ci skip] Add changelog entries for PR #3828

---
 user_guide_src/source/changelog.rst | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3a1804835..d175f4b90 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -30,6 +30,10 @@ Release Date: Not Released
    -  Added Unicode support to :doc:`URL Helper <helpers/url_helper>` function :php:func:`url_title()`.
    -  Added support for passing the "extra" parameter as an array to all :doc:`Form Helper <helpers/form_helper>` functions that use it.
 
+-  Core
+
+   -  Added support for defining a list of specific query parameters in ``$config['cache_query_string']`` for the :doc:`Output Library <libraries/output>`.
+
 Bug fixes for 3.0.1
 -------------------
 
@@ -58,6 +62,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3965) - :doc:`File Uploading Library <libraries/file_uploading>` ignored the "encrypt_name" setting when "overwrite" is enabled.
 -  Fixed a bug (#3968) - :doc:`Database Forge <database/forge>` method ``add_key()`` didn't treat array inputs as composite keys unless it's a PRIMARY KEY.
 -  Fixed a bug (#3715) - :doc:`Pagination Library <libraries/pagination>` could generate broken link when a protocol-relative base URL is used.
+-  Fixed a bug (#3828) - :doc:`Output Library <libraries/output>` method ``delete_cache()`` couldn't delete index page caches.
 
 Version 3.0.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 924ac35f6d5a51ab5a9c0a27fed246a5678c5ea6 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 16 Jul 2015 10:48:42 +0300
Subject: [ci skip] Fix #3869

Close #3978
Close #3979
---
 .../source/_themes/sphinx_rtd_theme/static/css/citheme.css         | 7 +++++++
 user_guide_src/source/_themes/sphinx_rtd_theme/theme.conf          | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 user_guide_src/source/_themes/sphinx_rtd_theme/static/css/citheme.css

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/_themes/sphinx_rtd_theme/static/css/citheme.css b/user_guide_src/source/_themes/sphinx_rtd_theme/static/css/citheme.css
new file mode 100644
index 000000000..10e7d04c6
--- /dev/null
+++ b/user_guide_src/source/_themes/sphinx_rtd_theme/static/css/citheme.css
@@ -0,0 +1,7 @@
+@import 'theme.css';
+
+.highlighted {
+	padding: 0px !important;
+	font-weight: inherit !important;
+	background-color: #f1d40f !important;	
+}
\ No newline at end of file
diff --git a/user_guide_src/source/_themes/sphinx_rtd_theme/theme.conf b/user_guide_src/source/_themes/sphinx_rtd_theme/theme.conf
index dcfbf8c22..5814ac963 100644
--- a/user_guide_src/source/_themes/sphinx_rtd_theme/theme.conf
+++ b/user_guide_src/source/_themes/sphinx_rtd_theme/theme.conf
@@ -1,6 +1,6 @@
 [theme]
 inherit = basic
-stylesheet = css/theme.css
+stylesheet = css/citheme.css
 
 [options]
 typekit_id = hiw1hhg
-- 
cgit v1.2.3-24-g4f1b


From 76e643e7e3ebff679407255f66eafae790912f31 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 16 Jul 2015 13:14:49 +0300
Subject: Refactor proposed changes from PR #3896

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d175f4b90..da4d8ff9a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -14,6 +14,7 @@ Release Date: Not Released
 -  Database
 
    -  Added ``list_fields()`` support for SQLite ('sqlite3' and 'pdo_sqlite' drivers).
+   -  Added support for setting SSL options for the 'mysqli' driver.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From a38b0c45c79f7045d8f322d7727226d3b458956e Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 16 Jul 2015 14:25:25 +0300
Subject: Add SSL support for PDO_MYSQL too

Related: #3896
---
 user_guide_src/source/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index da4d8ff9a..2cb5a6cd4 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -14,7 +14,7 @@ Release Date: Not Released
 -  Database
 
    -  Added ``list_fields()`` support for SQLite ('sqlite3' and 'pdo_sqlite' drivers).
-   -  Added support for setting SSL options for the 'mysqli' driver.
+   -  Added SSL connection support for the 'mysqli' and 'pdo_mysql' drivers.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From cbb70f0244b55935b61c605f3d2171489492c7db Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 16 Jul 2015 14:35:54 +0300
Subject: [ci skip] Update DB configuration docs with new SSL options

---
 user_guide_src/source/database/configuration.rst | 25 ++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index 6f1726ef6..6a6c84979 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -30,7 +30,6 @@ prototype::
 		'encrypt' => FALSE,
 		'compress' => FALSE,
 		'stricton' => FALSE,
-		'ssl_options' => array(),
 		'failover' => array()
 	);
 
@@ -72,8 +71,7 @@ These failovers can be specified by setting the failover for a connection like t
 				'swap_pre' => '',
 				'encrypt' => FALSE,
 				'compress' => FALSE,
-				'stricton' => FALSE,
-				'ssl_options' => array()
+				'stricton' => FALSE
 			),
 			array(
 				'hostname' => 'localhost2',
@@ -91,8 +89,7 @@ These failovers can be specified by setting the failover for a connection like t
 				'swap_pre' => '',
 				'encrypt' => FALSE,
 				'compress' => FALSE,
-				'stricton' => FALSE,
-				'ssl_options' => array()
+				'stricton' => FALSE
 			)
 		);
 
@@ -123,7 +120,6 @@ example, to set up a "test" environment you would do this::
 		'compress' => FALSE,
 		'encrypt' => FALSE,
 		'stricton' => FALSE,
-		'ssl_options' => array(),
 		'failover' => array()
 	);
 
@@ -156,9 +152,9 @@ when the database classes are initialized.
 Explanation of Values:
 ----------------------
 
-======================  ==================================================================================================
+======================  ===========================================================================================================
  Name Config             Description
-======================  ==================================================================================================
+======================  ===========================================================================================================
 **dsn**			The DSN connect string (an all-in-one configuration sequence).
 **hostname** 		The hostname of your database server. Often this is 'localhost'.
 **username**		The username used to connect to the database.
@@ -183,6 +179,16 @@ Explanation of Values:
 			customizable by the end user.
 **schema**		The database schema, defaults to 'public'. Used by PostgreSQL and ODBC drivers.
 **encrypt**		Whether or not to use an encrypted connection.
+
+			  - 'mysql' (deprecated), 'sqlsrv' and 'pdo/sqlsrv' drivers accept TRUE/FALSE
+			  - 'mysqli' and 'pdo/mysql' drivers accept an array with the following options:
+			  
+			    - 'ssl_key'    - Path to the private key file
+			    - 'ssl_cert'   - Path to the public key certificate file
+			    - 'ssl_ca'     - Path to the certificate authority file
+			    - 'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format
+			    - 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
+
 **compress**		Whether or not to use client compression (MySQL only).
 **stricton**		TRUE/FALSE (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL
 			while developing an application.
@@ -191,8 +197,7 @@ Explanation of Values:
 
 				$db['default']['port'] = 5432;
 
-**ssl_options**		Used to set various SSL connection options and values.
-======================  ==================================================================================================
+======================  ===========================================================================================================
 
 .. note:: Depending on what database platform you are using (MySQL, PostgreSQL,
 	etc.) not all values will be needed. For example, when using SQLite you
-- 
cgit v1.2.3-24-g4f1b


From cfc9e77c89ee5377b25e411ef3d8ab43c8900b7e Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 16 Jul 2015 16:17:27 +0300
Subject: Add 'ssl_verify' option for mysqli driver

MYSQLI_OPT_SSL_VERIFY_SERVER_CERT is an undocumented option that may not always be available.
Reference: http://svn.php.net/viewvc/php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt?view=markup&pathrev=302897
---
 user_guide_src/source/database/configuration.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/database/configuration.rst b/user_guide_src/source/database/configuration.rst
index 6a6c84979..8026be63a 100644
--- a/user_guide_src/source/database/configuration.rst
+++ b/user_guide_src/source/database/configuration.rst
@@ -188,6 +188,7 @@ Explanation of Values:
 			    - 'ssl_ca'     - Path to the certificate authority file
 			    - 'ssl_capath' - Path to a directory containing trusted CA certificats in PEM format
 			    - 'ssl_cipher' - List of *allowed* ciphers to be used for the encryption, separated by colons (':')
+			    - 'ssl_verify' - TRUE/FALSE; Whether to verify the server certificate or not ('mysqli' only)
 
 **compress**		Whether or not to use client compression (MySQL only).
 **stricton**		TRUE/FALSE (boolean) - Whether to force "Strict Mode" connections, good for ensuring strict SQL
-- 
cgit v1.2.3-24-g4f1b


From 87ed4023ac153c53ac1e8eab651fa5131df2c61f Mon Sep 17 00:00:00 2001
From: kenjis <kenji.uui@gmail.com>
Date: Fri, 17 Jul 2015 11:29:51 +0900
Subject: Fix sample code

---
 user_guide_src/source/libraries/output.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/libraries/output.rst b/user_guide_src/source/libraries/output.rst
index 4b36d2a03..84529f766 100644
--- a/user_guide_src/source/libraries/output.rst
+++ b/user_guide_src/source/libraries/output.rst
@@ -160,7 +160,7 @@ Class Reference
 
 		Permits you to manually set a server status header. Example::
 
-			$this->output->set_status_header('401');
+			$this->output->set_status_header(401);
 			// Sets the header as:  Unauthorized
 
 		`See here <http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html>`_ for a full list of headers.
@@ -230,4 +230,4 @@ Class Reference
 				->_display();
 			exit;
 
-		.. note:: Calling this method manually without aborting script execution will result in duplicated output.
\ No newline at end of file
+		.. note:: Calling this method manually without aborting script execution will result in duplicated output.
-- 
cgit v1.2.3-24-g4f1b


From 611e1fda7318ffefe27f4a002de29b9b88b874ba Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 17 Jul 2015 12:24:29 +0300
Subject: [ci skip] Fix a bug reported via PR #3704

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2cb5a6cd4..f003f5635 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -64,6 +64,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3968) - :doc:`Database Forge <database/forge>` method ``add_key()`` didn't treat array inputs as composite keys unless it's a PRIMARY KEY.
 -  Fixed a bug (#3715) - :doc:`Pagination Library <libraries/pagination>` could generate broken link when a protocol-relative base URL is used.
 -  Fixed a bug (#3828) - :doc:`Output Library <libraries/output>` method ``delete_cache()`` couldn't delete index page caches.
+-  Fixed a bug (#3704) - :doc:`Database <database>` method ``stored_procedure()`` in the 'oci8' driver didn't properly bind parameters.
 
 Version 3.0.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 15e2df7424c369ec7ff93676a8b01fa199f04a95 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 17 Jul 2015 13:56:49 +0300
Subject: [ci skip] Fix #3778

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f003f5635..f70414c43 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -65,6 +65,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3715) - :doc:`Pagination Library <libraries/pagination>` could generate broken link when a protocol-relative base URL is used.
 -  Fixed a bug (#3828) - :doc:`Output Library <libraries/output>` method ``delete_cache()`` couldn't delete index page caches.
 -  Fixed a bug (#3704) - :doc:`Database <database>` method ``stored_procedure()`` in the 'oci8' driver didn't properly bind parameters.
+-  Fixed a bug (#3778) - :doc:`Download Helper <helpers/download_helper>` function :php:func:`force_download()` incorrectly sent a *Pragma* response header.
 
 Version 3.0.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 2ef5ed458c611331facfeb5abee051f4c0d1b08e Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Fri, 17 Jul 2015 14:24:26 +0300
Subject: Fix #3752

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f70414c43..a100f3fbf 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -66,6 +66,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3828) - :doc:`Output Library <libraries/output>` method ``delete_cache()`` couldn't delete index page caches.
 -  Fixed a bug (#3704) - :doc:`Database <database>` method ``stored_procedure()`` in the 'oci8' driver didn't properly bind parameters.
 -  Fixed a bug (#3778) - :doc:`Download Helper <helpers/download_helper>` function :php:func:`force_download()` incorrectly sent a *Pragma* response header.
+-  Fixed a bug (#3752) - ``$routing['directory']`` overrides were not properly handled and always resulted in a 404 "Not Found" error.
 
 Version 3.0.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From e17dbe6000a7f5ab3efe42c80bee7ca80dcc23c3 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 20 Jul 2015 10:32:36 +0300
Subject: [ci skip] Fix #3985

---
 user_guide_src/source/general/environments.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/general/environments.rst b/user_guide_src/source/general/environments.rst
index 7f030b6ef..ac6f3235e 100644
--- a/user_guide_src/source/general/environments.rst
+++ b/user_guide_src/source/general/environments.rst
@@ -49,4 +49,4 @@ Optionally, you can have CodeIgniter load environment-specific
 configuration files. This may be useful for managing things like
 differing API keys across multiple environments. This is described in
 more detail in the environment section of the :doc:`Config Class
-<../libraries/config>`_ documentation.
\ No newline at end of file
+<../libraries/config>` documentation.
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b


From 72774470d435b18fac6cb90bc4e4ff2b9e8684a2 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 20 Jul 2015 12:34:43 +0300
Subject: [ci skip] Add a changelog entry for last commit

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a100f3fbf..16d6db71a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -67,6 +67,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3704) - :doc:`Database <database>` method ``stored_procedure()`` in the 'oci8' driver didn't properly bind parameters.
 -  Fixed a bug (#3778) - :doc:`Download Helper <helpers/download_helper>` function :php:func:`force_download()` incorrectly sent a *Pragma* response header.
 -  Fixed a bug (#3752) - ``$routing['directory']`` overrides were not properly handled and always resulted in a 404 "Not Found" error.
+-  Fixed an internal bug in :doc:`Query Builder <database/query_builder>` escaping logic where if field name escaping is force-disabled, methods ``where()`` and ``having()`` will also treat values as fields.
 
 Version 3.0.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From ca71ba489133c5386e93c75aaa65722fbd90a131 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 20 Jul 2015 14:51:43 +0300
Subject: [ci skip] Add upgrade instructions for 3.0.1

---
 user_guide_src/source/installation/upgrade_301.rst | 19 +++++++++++++++++++
 user_guide_src/source/installation/upgrading.rst   |  3 ++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 user_guide_src/source/installation/upgrade_301.rst

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/installation/upgrade_301.rst b/user_guide_src/source/installation/upgrade_301.rst
new file mode 100644
index 000000000..f38d34008
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_301.rst
@@ -0,0 +1,19 @@
+#############################
+Upgrading from 3.0.0 to 3.0.1
+#############################
+
+Before performing an update you should take your site offline by
+replacing the index.php file with a static one.
+
+Step 1: Update your CodeIgniter files
+=====================================
+
+Replace all files and directories in your *system/* directory.
+
+.. note:: If you have any custom developed files in these directories,
+	please make copies of them first.
+
+Step 2: Update your CLI error templates
+=======================================
+
+Replace all files under your *application/errors/cli/* directory.
\ No newline at end of file
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 89e90e714..30382aea2 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,7 +8,8 @@ upgrading from.
 .. toctree::
 	:titlesonly:
 
-	Upgrading from 2.2.x to 3.0.0 <upgrade_300>
+	Upgrading from 3.0.0 to 3.0.1 <upgrade_301>
+	Upgrading from 2.2.x to 3.0.x <upgrade_300>
 	Upgrading from 2.2.0 to 2.2.1 <upgrade_221>
 	Upgrading from 2.1.4 to 2.2.0 <upgrade_220>
 	Upgrading from 2.1.3 to 2.1.4 <upgrade_214>
-- 
cgit v1.2.3-24-g4f1b


From 2b655187e6cb3d872eafbb8feb8382f3f9252dbc Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 20 Jul 2015 14:52:04 +0300
Subject: [ci skip] Fix a docs compile warning

---
 user_guide_src/source/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 16d6db71a..69fe08943 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -64,7 +64,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3968) - :doc:`Database Forge <database/forge>` method ``add_key()`` didn't treat array inputs as composite keys unless it's a PRIMARY KEY.
 -  Fixed a bug (#3715) - :doc:`Pagination Library <libraries/pagination>` could generate broken link when a protocol-relative base URL is used.
 -  Fixed a bug (#3828) - :doc:`Output Library <libraries/output>` method ``delete_cache()`` couldn't delete index page caches.
--  Fixed a bug (#3704) - :doc:`Database <database>` method ``stored_procedure()`` in the 'oci8' driver didn't properly bind parameters.
+-  Fixed a bug (#3704) - :doc:`Database <database/index>` method ``stored_procedure()`` in the 'oci8' driver didn't properly bind parameters.
 -  Fixed a bug (#3778) - :doc:`Download Helper <helpers/download_helper>` function :php:func:`force_download()` incorrectly sent a *Pragma* response header.
 -  Fixed a bug (#3752) - ``$routing['directory']`` overrides were not properly handled and always resulted in a 404 "Not Found" error.
 -  Fixed an internal bug in :doc:`Query Builder <database/query_builder>` escaping logic where if field name escaping is force-disabled, methods ``where()`` and ``having()`` will also treat values as fields.
-- 
cgit v1.2.3-24-g4f1b


From e4e8f5daf15440ade1a80efc09af3cabe2cd1386 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 20 Jul 2015 15:28:26 +0300
Subject: [ci skip] Update user-guide with info about 2.2.2, 2.2.3

---
 user_guide_src/source/changelog.rst                | 24 ++++++++++++++++++++++
 user_guide_src/source/installation/downloads.rst   |  5 ++++-
 user_guide_src/source/installation/upgrade_220.rst |  2 +-
 user_guide_src/source/installation/upgrade_222.rst | 14 +++++++++++++
 user_guide_src/source/installation/upgrade_223.rst | 14 +++++++++++++
 user_guide_src/source/installation/upgrading.rst   |  4 +++-
 6 files changed, 60 insertions(+), 3 deletions(-)
 create mode 100644 user_guide_src/source/installation/upgrade_222.rst
 create mode 100644 user_guide_src/source/installation/upgrade_223.rst

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 69fe08943..85bf80097 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -841,6 +841,30 @@ Bug fixes for 3.0
 -  Fixed a bug (#3573) - :doc:`Email Library <libraries/email>` violated `RFC5321 <https://tools.ietf.org/rfc/rfc5321.txt>`_ by sending 'localhost.localdomain' as a hostname.
 -  Fixed a bug (#3572) - ``CI_Security::_remove_evil_attributes()`` failed for large-sized inputs due to *pcre.backtrack_limit* and didn't properly match HTML tags.
 
+Version 2.2.3
+=============
+
+Release Date: July 14, 2015
+
+-  Security
+
+   - Removed a fallback to ``mysql_escape_string()`` in the 'mysql' database driver (``escape_str()`` method) when there's no active database connection.
+
+Version 2.2.2
+=============
+
+Release Date: April 15, 2015
+
+-  General Changes
+
+   - Added HTTP "Host" header character validation to prevent cache poisoning attacks when *base_url* auto-detection is used.
+   - Added *FSCommand* and *seekSegmentTime* to the "evil attributes" list in ``CI_Security::xss_clean()``.
+
+Bug fixes for 2.2.2
+-------------------
+
+-  Fixed a bug (#3665) - ``CI_Security::entity_decode()`` triggered warnings under some circumstances.
+
 Version 2.2.1
 =============
 
diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst
index e2b6a9c18..16c8e537a 100644
--- a/user_guide_src/source/installation/downloads.rst
+++ b/user_guide_src/source/installation/downloads.rst
@@ -2,7 +2,10 @@
 Downloading CodeIgniter
 #######################
 
--  `CodeIgniter v3.0.0 (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/develop>`_
+-  `CodeIgniter v3.0.1-dev (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/develop>`_
+-  `CodeIgniter v3.0.0 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.0>`_
+-  `CodeIgniter v2.2.3 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/2.2.3>`_
+-  `CodeIgniter v2.2.2 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/2.2.2>`_
 -  `CodeIgniter v2.2.1 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/2.2.1>`_
 -  `CodeIgniter v2.2.0 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/2.2.0>`_
 -  `CodeIgniter v2.1.4 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/2.1.4>`_
diff --git a/user_guide_src/source/installation/upgrade_220.rst b/user_guide_src/source/installation/upgrade_220.rst
index b2e943223..91f9e00cd 100644
--- a/user_guide_src/source/installation/upgrade_220.rst
+++ b/user_guide_src/source/installation/upgrade_220.rst
@@ -1,5 +1,5 @@
 #############################
-Upgrading from 2.1.4 to 2.2.0
+Upgrading from 2.1.4 to 2.2.x
 #############################
 
 .. note:: The :doc:`Encrypt Class </libraries/encrypt>` now requires the
diff --git a/user_guide_src/source/installation/upgrade_222.rst b/user_guide_src/source/installation/upgrade_222.rst
new file mode 100644
index 000000000..9dcc61d0e
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_222.rst
@@ -0,0 +1,14 @@
+#############################
+Upgrading from 2.2.1 to 2.2.2
+#############################
+
+Before performing an update you should take your site offline by
+replacing the index.php file with a static one.
+
+Step 1: Update your CodeIgniter files
+=====================================
+
+Replace all files and directories in your "system" folder.
+
+.. note:: If you have any custom developed files in these folders please
+	make copies of them first.
\ No newline at end of file
diff --git a/user_guide_src/source/installation/upgrade_223.rst b/user_guide_src/source/installation/upgrade_223.rst
new file mode 100644
index 000000000..252318ae1
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_223.rst
@@ -0,0 +1,14 @@
+#############################
+Upgrading from 2.2.2 to 2.2.3
+#############################
+
+Before performing an update you should take your site offline by
+replacing the index.php file with a static one.
+
+Step 1: Update your CodeIgniter files
+=====================================
+
+Replace all files and directories in your "system" folder.
+
+.. note:: If you have any custom developed files in these folders please
+	make copies of them first.
\ No newline at end of file
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 30382aea2..e0f0dd5b7 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -10,8 +10,10 @@ upgrading from.
 
 	Upgrading from 3.0.0 to 3.0.1 <upgrade_301>
 	Upgrading from 2.2.x to 3.0.x <upgrade_300>
+	Upgrading from 2.2.2 to 2.2.3 <upgrade_223>
+	Upgrading from 2.2.1 to 2.2.2 <upgrade_222>
 	Upgrading from 2.2.0 to 2.2.1 <upgrade_221>
-	Upgrading from 2.1.4 to 2.2.0 <upgrade_220>
+	Upgrading from 2.1.4 to 2.2.x <upgrade_220>
 	Upgrading from 2.1.3 to 2.1.4 <upgrade_214>
 	Upgrading from 2.1.2 to 2.1.3 <upgrade_213>
 	Upgrading from 2.1.1 to 2.1.2 <upgrade_212>
-- 
cgit v1.2.3-24-g4f1b


From 4b9fec6797db2aea3af8ca4080be73e2ff421080 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Mon, 20 Jul 2015 17:26:31 +0300
Subject: Fix #3279

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 85bf80097..22243cf04 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -68,6 +68,7 @@ Bug fixes for 3.0.1
 -  Fixed a bug (#3778) - :doc:`Download Helper <helpers/download_helper>` function :php:func:`force_download()` incorrectly sent a *Pragma* response header.
 -  Fixed a bug (#3752) - ``$routing['directory']`` overrides were not properly handled and always resulted in a 404 "Not Found" error.
 -  Fixed an internal bug in :doc:`Query Builder <database/query_builder>` escaping logic where if field name escaping is force-disabled, methods ``where()`` and ``having()`` will also treat values as fields.
+-  Fixed a bug (#3279) - :doc:`Query Builder <database/query_builder>` methods ``update()`` and ``get_compiled_update()`` did double escaping on the table name if it was provided via ``from()``.
 
 Version 3.0.0
 =============
-- 
cgit v1.2.3-24-g4f1b