From 8ede1a2ecbb62577afd32996956c5feaf7ddf9b6 Mon Sep 17 00:00:00 2001 From: Derek Jones Date: Wed, 5 Oct 2011 13:34:52 -0500 Subject: replacing the old HTML user guide with a Sphinx-managed user guide --- user_guide_src/source/changelog.rst | 2177 +++++++++++++++++++++++++++++++++++ 1 file changed, 2177 insertions(+) create mode 100644 user_guide_src/source/changelog.rst (limited to 'user_guide_src/source/changelog.rst') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst new file mode 100644 index 000000000..e94e87e58 --- /dev/null +++ b/user_guide_src/source/changelog.rst @@ -0,0 +1,2177 @@ +########## +Change Log +########## + +Version 2.1.0 (planned) +======================= + +Release Date: Not Released + +- General Changes + + - Added Android to the list of user agents. + - Added Windows 7 to the list of user platforms. + - Callback validation rules can now accept parameters like any other + validation rule. + - Ability to log certain error types, not all under a threshold. + - Added html_escape() to :doc:`Common + functions ` to escape HTML output + for preventing XSS. + - Added support for pem,p10,p12,p7a,p7c,p7m,p7r,p7s,crt,crl,der,kdb,rsa,cer,sst,csr Certs to mimes.php. + - Added support pgp,gpg to mimes.php. + - Added support 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php. + - Added support m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php. + +- Helpers + + - Added increment_string() to :doc:`String + Helper ` to turn "foo" into "foo-1" + or "foo-1" into "foo-2". + - Altered form helper - made action on form_open_multipart helper + function call optional. Fixes (#65) + - url_title() will now trim extra dashes from beginning and end. + - Improved speed of String Helper's random_string() method + - Added XHTML Basic 1.1 doctype to HTML Helper. + +- Database + + - Added a `CUBRID `_ driver to the `Database + Driver `. Thanks to the CUBRID team for + supplying this patch. + - Added a PDO driver to the Database Driver. + - Typecast limit and offset in the :doc:`Database + Driver ` to integers to avoid possible + injection. + - Added additional option 'none' for the optional third argument for + $this->db->like() in the :doc:`Database + Driver `. + - Added $this->db->insert_batch() support to the OCI8 (Oracle) driver. + +- Libraries + + - Changed $this->cart->insert() in the :doc:`Cart + Library ` to return the Row ID if a single + item was inserted successfully. + - Added support to set an optional parameter in your callback rules + of validation using the :doc:`Form Validation + Library `. + - Driver children can be located in any package path. + - Added max_filename_increment config setting for Upload library. + - CI_Loader::_ci_autoloader() is now a protected method. + - Added is_unique to the :doc:`Form Validation + library `. + - Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the Form Validation library. + - Added $config['use_page_numbers'] to the Pagination library, which enables real page numbers in the URI. + - Added TLS and SSL Encryption for SMTP. + +- Core + + - Changed private functions in CI_URI to protected so MY_URI can + override them. + - Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions). + +Bug fixes for 2.1.0 +------------------- + +- Unlink raised an error if cache file did not exist when you try to delete it. +- Fixed #378 Robots identified as regular browsers by the User Agent + class. +- If a config class was loaded first then a library with the same name + is loaded, the config would be ignored. +- Fixed a bug (Reactor #19) where 1) the 404_override route was being + ignored in some cases, and 2) auto-loaded libraries were not + available to the 404_override controller when a controller existed + but the requested method did not. +- Fixed a bug (Reactor #89) where MySQL export would fail if the table + had hyphens or other non alphanumeric/underscore characters. +- Fixed a bug (#200) where MySQL queries would be malformed after + calling count_all() then db->get() +- Fixed bug #105 that stopped query errors from being logged unless database debugging was enabled +- Fixed a bug (#181) where a mis-spelling was in the form validation + language file. +- Fixed a bug (#160) - Removed unneeded array copy in the file cache + driver. +- Fixed a bug (#150) - field_data() now correctly returns column + length. +- Fixed a bug (#8) - load_class() now looks for core classes in + APPPATH first, allowing them to be replaced. +- Fixed a bug (#24) - ODBC database driver called incorrect parent in + __construct(). +- Fixed a bug (#85) - OCI8 (Oracle) database escape_str() function did + not escape correct. +- Fixed a bug (#344) - Using schema found in Saving Session Data to a Database, system would throw error "user_data does not have a default value" when deleting then creating a session. +- Fixed a bug (#112) - OCI8 (Oracle) driver didn't pass the configured database character set when connecting. +- Fixed a bug (#182) - OCI8 (Oracle) driver used to re-execute the statement whenever num_rows() is called. +- Fixed a bug (#82) - WHERE clause field names in the DB update_string() method were not escaped, resulting in failed queries in some cases. +- Fixed a bug (#89) - Fix a variable type mismatch in DB display_error() where an array is expected, but a string could be set instead. +- Fixed a bug (#467) - Suppress warnings generated from get_magic_quotes_gpc() (deprecated in PHP 5.4) +- Fixed a bug (#484) - First time _csrf_set_hash() is called, hash is never set to the cookie (in Security.php). + +Version 2.0.3 +============= + +Release Date: August 20, 2011 + +- Security + + - An improvement was made to the MySQL and MySQLi drivers to prevent + exposing a potential vector for SQL injection on sites using + multi-byte character sets in the database client connection. + An incompatibility in PHP versions < 5.2.3 and MySQL < 5.0.7 with + *mysql_set_charset()* creates a situation where using multi-byte + character sets on these environments may potentially expose a SQL + injection attack vector. Latin-1, UTF-8, and other "low ASCII" + character sets are unaffected on all environments. + + If you are running or considering running a multi-byte character + set for your database connection, please pay close attention to + the server environment you are deploying on to ensure you are not + vulnerable. + +- General Changes + + - Fixed a bug where there was a misspelling within a code comment in + the index.php file. + - Added Session Class userdata to the output profiler. Additionally, + added a show/hide toggle on HTTP Headers, Session Data and Config + Variables. + - Removed internal usage of the EXT constant. + - Visual updates to the welcome_message view file and default error + templates. Thanks to `danijelb `_ + for the pull request. + - Added insert_batch() function to the PostgreSQL database driver. + Thanks to epallerols for the patch. + - Added "application/x-csv" to mimes.php. + - Added CSRF protection URI whitelisting. + - Fixed a bug where `Email library ` + attachments with a "." in the name would using invalid MIME-types. + - Added support for + pem,p10,p12,p7a,p7c,p7m,p7r,p7s,crt,crl,der,kdb,rsa,cer,sst,csr + Certs to mimes.php. + - Added support pgp,gpg to mimes.php. + - Added support 3gp, 3g2, mp4, wmv, f4v, vlc Video files to + mimes.php. + - Added support m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files + to mimes.php. + +- Helpers + + - Added an optional third parameter to heading() which allows adding + html attributes to the rendered heading tag. + - form_open() now only adds a hidden (Cross-site Reference Forgery) + protection field when the form's action is internal and is set to + the post method. (Reactor #165) + - Re-worked plural() and singular() functions in the :doc:`Inflector + helper ` to support considerably + more words. + +- Libraries + + - Altered Session to use a longer match against the user_agent + string. See upgrade notes if using database sessions. + - Added $this->db->set_dbprefix() to the :doc:`Database + Driver `. + - Changed $this->cart->insert() in the :doc:`Cart + Library ` to return the Row ID if a single + item was inserted successfully. + - Added $this->load->get_var() to the :doc:`Loader + library ` to retrieve global vars set with + $this->load->view() and $this->load->vars(). + - Changed $this->db->having() to insert quotes using escape() rather + than escape_str(). + +Bug fixes for 2.0.3 +------------------- + +- Added ENVIRONMENT to reserved constants. (Reactor #196) +- Changed server check to ensure SCRIPT_NAME is defined. (Reactor #57) +- Removed APPPATH.'third_party' from the packages autoloader to negate + needless file stats if no packages exist or if the developer does not + load any other packages by default. +- Fixed a bug (Reactor #231) where Sessions Library database table + example SQL did not contain an index on last_activity. See :doc:`Upgrade + Notes `. +- Fixed a bug (Reactor #229) where the Sessions Library example SQL in + the documentation contained incorrect SQL. +- Fixed a bug (Core #340) where when passing in the second parameter to + $this->db->select(), column names in subsequent queries would not be + properly escaped. +- Fixed issue #199 - Attributes passed as string does not include a + space between it and the opening tag. +- Fixed a bug where the method $this->cart->total_items() from :doc:`Cart + Library ` now returns the sum of the quantity + of all items in the cart instead of your total count. +- Fixed a bug where not setting 'null' when adding fields in db_forge + for mysql and mysqli drivers would default to NULL instead of NOT + NULL as the docs suggest. +- Fixed a bug where using $this->db->select_max(), + $this->db->select_min(), etc could throw notices. Thanks to w43l for + the patch. +- Replace checks for STDIN with php_sapi_name() == 'cli' which on the + whole is more reliable. This should get parameters in crontab + working. + +Version 2.0.2 +============= + +Release Date: April 7, 2011 +Hg Tag: v2.0.2 + +- General changes + + - The :doc:`Security library <./libraries/security>` was moved to + the core and is now loaded automatically. Please remove your + loading calls. + - The CI_SHA class is now deprecated. All supported versions of PHP + provide a sha1() function. + - constants.php will now be loaded from the environment folder if + available. + - Added language key error logging + - Made Environment Support optional. Comment out or delete the + constant to stop environment checks. + - Added Environment Support for Hooks. + - Added CI\_ Prefix to the :doc:`Cache driver `. + - Added :doc:`CLI usage <./general/cli>` documentation. + +- Helpers + + - Removed the previously deprecated dohash() from the :doc:`Security + helper <./helpers/security_helper>`; use do_hash() instead. + - Changed the 'plural' function so that it doesn't ruin the + captalization of your string. It also take into consideration + acronyms which are all caps. + +- Database + + - $this->db->count_all_results() will now return an integer + instead of a string. + +Bug fixes for 2.0.2 +------------------- + +- Fixed a bug (Reactor #145) where the Output Library had + parse_exec_vars set to protected. +- Fixed a bug (Reactor #80) where is_really_writable would create an + empty file when on Windows or with safe_mode enabled. +- Fixed various bugs with User Guide. +- Added is_cli_request() method to documentation for :doc:`Input + class `. +- Added form_validation_lang entries for decimal, less_than and + greater_than. +- `Fixed issue + #153 `_ + Escape Str Bug in MSSQL driver. +- `Fixed issue + #172 `_ + Google Chrome 11 posts incorrectly when action is empty. + +Version 2.0.1 +============= + +Release Date: March 15, 2011 +Hg Tag: v2.0.1 + +- General changes + + - Added $config['cookie_secure'] to the config file to allow + requiring a secure (HTTPS) in order to set cookies. + - Added the constant CI_CORE to help differentiate between Core: + TRUE and Reactor: FALSE. + - Added an ENVIRONMENT constant in index.php, which affects PHP + error reporting settings, and optionally, which configuration + files are loaded (see below). Read more on the `Handling + Environments ` page. + - Added support for + :ref:`environment-specific ` + configuration files. + +- Libraries + + - Added decimal, less_than and greater_than rules to the `Form + validation Class `. + - :doc:`Input Class ` methods post() and get() + will now return a full array if the first argument is not + provided. + - Secure cookies can now be made with the set_cookie() helper and + :doc:`Input Class ` method. + - Added set_content_type() to :doc:`Output + Class ` to set the output Content-Type + HTTP header based on a MIME Type or a config/mimes.php array key. + - :doc:`Output Class ` will now support method + chaining. + +- Helpers + + - Changed the logic for form_open() in :doc:`Form + helper `. If no value is passed it will + submit to the current URL. + +Bug fixes for 2.0.1 +------------------- + +- CLI requests can now be run from any folder, not just when CD'ed next + to index.php. +- Fixed issue #41: Added audio/mp3 mime type to mp3. +- Fixed a bug (Core #329) where the file caching driver referenced the + incorrect cache directory. +- Fixed a bug (Reactor #69) where the SHA1 library was named + incorrectly. + +Version 2.0.0 +============= + +Release Date: January 28, 2011 +Hg Tag: v2.0.0 + +- General changes + + - PHP 4 support is removed. CodeIgniter now requires PHP 5.1.6. + - Scaffolding, having been deprecated for a number of versions, has + been removed. + - Plugins have been removed, in favor of Helpers. The CAPTCHA plugin + has been converted to a Helper and + :doc:`documented <./helpers/captcha_helper>`. The JavaScript + calendar plugin was removed due to the ready availability of great + JavaScript calendars, particularly with jQuery. + - Added new special Library type: + :doc:`Drivers <./general/drivers>`. + - Added full query-string support. See the config file for details. + - Moved the application folder outside of the system folder. + - Moved system/cache and system/logs directories to the application + directory. + - Added routing overrides to the main index.php file, enabling the + normal routing to be overridden on a per "index" file basis. + - Added the ability to set config values (or override config values) + directly from data set in the main index.php file. This allows a + single application to be used with multiple front controllers, + each having its own config values. + - Added $config['directory_trigger'] to the config file so that a + controller sub-directory can be specified when running _GET + strings instead of URI segments. + - Added ability to set "Package" paths - specific paths where the + Loader and Config classes should try to look first for a requested + file. This allows distribution of sub-applications with their own + libraries, models, config files, etc. in a single "package" + directory. See the :doc:`Loader class ` + documentation for more details. + - In-development code is now hosted at + `BitBucket `_. + - Removed the deprecated Validation Class. + - Added CI\_ Prefix to all core classes. + - Package paths can now be set in application/config/autoload.php. + - `Upload library ` file_name can + now be set without an extension, the extension will be taken from + the uploaded file instead of the given name. + - In :doc:`Database Forge ` the name can be omitted + from $this->dbforge->modify_column()'s 2nd param if you aren't + changing the name. + - $config['base_url'] is now empty by default and will guess what + it should be. + - Enabled full Command Line Interface compatibility with + config['uri_protocol'] = 'CLI';. + +- Libraries + + - Added a :doc:`Cache driver ` with APC, + memcached, and file-based support. + - Added $prefix, $suffix and $first_url properties to :doc:`Pagination + library <./libraries/pagination>`. + - Added the ability to suppress first, previous, next, last, and + page links by setting their values to FALSE in the :doc:`Pagination + library <./libraries/pagination>`. + - Added :doc:`Security library <./libraries/security>`, which now + contains the xss_clean function, filename_security function and + other security related functions. + - Added CSRF (Cross-site Reference Forgery) protection to the + :doc:`Security library <./libraries/security>`. + - Added $parse_exec_vars property to Output library. + - Added ability to enable / disable individual sections of the + :doc:`Profiler ` + - Added a wildcard option $config['allowed_types'] = '\*' to the + :doc:`File Uploading Class <./libraries/file_uploading>`. + - Added an 'object' config variable to the XML-RPC Server library so + that one can specify the object to look for requested methods, + instead of assuming it is in the $CI superobject. + - Added "is_object" into the list of unit tests capable of being + run. + - Table library will generate an empty cell with a blank string, or + NULL value. + - Added ability to set tag attributes for individual cells in the + Table library + - Added a parse_string() method to the :doc:`Parser + Class `. + - Added HTTP headers and Config information to the + :doc:`Profiler ` output. + - Added Chrome and Flock to the list of detectable browsers by + browser() in the :doc:`User Agent Class `. + - The :doc:`Unit Test Class ` now has an + optional "notes" field available to it, and allows for discrete + display of test result items using + $this->unit->set_test_items(). + - Added a $xss_clean class variable to the XMLRPC library, enabling + control over the use of the Security library's xss_clean() + method. + - Added a download() method to the :doc:`FTP + library ` + - Changed do_xss_clean() to return FALSE if the uploaded file + fails XSS checks. + - Added stripslashes() and trim()ing of double quotes from $_FILES + type value to standardize input in Upload library. + - Added a second parameter (boolean) to + $this->zip->read_dir('/path/to/directory', FALSE) to remove the + preceding trail of empty folders when creating a Zip archive. This + example would contain a zip with "directory" and all of its + contents. + - Added ability in the Image Library to handle PNG transparency for + resize operations when using the GD lib. + - Modified the Session class to prevent use if no encryption key is + set in the config file. + - Added a new config item to the Session class + sess_expire_on_close to allow sessions to auto-expire when the + browser window is closed. + - Improved performance of the Encryption library on servers where + Mcrypt is available. + - Changed the default encryption mode in the Encryption library to + CBC. + - Added an encode_from_legacy() method to provide a way to + transition encrypted data from CodeIgniter 1.x to CodeIgniter 2.x. + Please see the :doc:`upgrade + instructions <./installation/upgrade_200>` for details. + - Altered Form_Validation library to allow for method chaining on + set_rules(), set_message() and set_error_delimiters() + functions. + - Altered Email Library to allow for method chaining. + - Added request_headers(), get_request_header() and + is_ajax_request() to the input class. + - Altered :doc:`User agent library ` so that + is_browser(), is_mobile() and is_robot() can optionally check + for a specific browser or mobile device. + - Altered :doc:`Input library ` so that post() and + get() will return all POST and GET items (respectively) if there + are no parameters passed in. + +- Database + + - :doc:`database configuration <./database/configuration>`. + - Added autoinit value to :doc:`database + configuration <./database/configuration>`. + - Added stricton value to :doc:`database + configuration <./database/configuration>`. + - Added database_exists() to the :doc:`Database Utilities + Class `. + - Semantic change to db->version() function to allow a list of + exceptions for databases with functions to return version string + instead of specially formed SQL queries. Currently this list only + includes Oracle and SQLite. + - Fixed a bug where driver specific table identifier protection + could lead to malformed queries in the field_data() functions. + - Fixed a bug where an undefined class variable was referenced in + database drivers. + - Modified the database errors to show the filename and line number + of the problematic query. + - Removed the following deprecated functions: orwhere, orlike, + groupby, orhaving, orderby, getwhere. + - Removed deprecated _drop_database() and _create_database() + functions from the db utility drivers. + - Improved dbforge create_table() function for the Postgres driver. + +- Helpers + + - Added convert_accented_characters() function to :doc:`text + helper <./helpers/text_helper>`. + - Added accept-charset to the list of inserted attributes of + form_open() in the :doc:`Form Helper `. + - Deprecated the dohash() function in favour of do_hash() for + naming consistency. + - Non-backwards compatible change made to get_dir_file_info() in + the :doc:`File Helper `. No longer recurses + by default so as to encourage responsible use (this function can + cause server performance issues when used without caution). + - Modified the second parameter of directory_map() in the + :doc:`Directory Helper ` to accept an + integer to specify recursion depth. + - Modified delete_files() in the :doc:`File + Helper ` to return FALSE on failure. + - Added an optional second parameter to byte_format() in the + :doc:`Number Helper ` to allow for decimal + precision. + - Added alpha, and sha1 string types to random_string() in the + :doc:`String Helper `. + - Modified prep_url() so as to not prepend http:// if the supplied + string already has a scheme. + - Modified get_file_info in the file helper, changing filectime() + to filemtime() for dates. + - Modified smiley_js() to add optional third parameter to return + only the javascript with no script tags. + - The img() function of the :doc:`HTML + helper <./helpers/html_helper>` will now generate an empty + string as an alt attribute if one is not provided. + - If CSRF is enabled in the application config file, form_open() + will automatically insert it as a hidden field. + - Added sanitize_filename() into the :doc:`Security + helper <./helpers/security_helper>`. + - Added ellipsize() to the :doc:`Text + Helper <./helpers/text_helper>` + - Added elements() to the :doc:`Array + Helper <./helpers/array_helper>` + +- Other Changes + + - Added an optional second parameter to show_404() to disable + logging. + - Updated loader to automatically apply the sub-class prefix as an + option when loading classes. Class names can be prefixed with the + standard "CI\_" or the same prefix as the subclass prefix, or no + prefix at all. + - Increased randomness with is_really_writable() to avoid file + collisions when hundreds or thousands of requests occur at once. + - Switched some DIR_WRITE_MODE constant uses to FILE_WRITE_MODE + where files and not directories are being operated on. + - get_mime_by_extension() is now case insensitive. + - Added "default" to the list :doc:`Reserved + Names `. + - Added 'application/x-msdownload' for .exe files and + ''application/x-gzip-compressed' for .tgz files to + config/mimes.php. + - Updated the output library to no longer compress output or send + content-length headers if the server runs with + zlib.output_compression enabled. + - Eliminated a call to is_really_writable() on each request unless + it is really needed (Output caching) + - Documented append_output() in the :doc:`Output + Class `. + - Documented a second argument in the decode() function for the + :doc:`Encryption Class `. + - Documented db->close(). + - Updated the router to support a default route with any number of + segments. + - Moved _remove_invisible_characters() function from the + :doc:`Security Library ` to :doc:`common + functions. ` + - Added audio/mpeg3 as a valid mime type for MP3. + +Bug fixes for 2.0.0 +------------------- + +- Fixed a bug where you could not change the User-Agent when sending + email. +- Fixed a bug where the Output class would send incorrect cached output + for controllers implementing their own _output() method. +- Fixed a bug where a failed query would not have a saved query + execution time causing errors in the Profiler +- Fixed a bug that was writing log entries when multiple identical + helpers and plugins were loaded. +- Fixed assorted user guide typos or examples (#10693, #8951, #7825, + #8660, #7883, #6771, #10656). +- Fixed a language key in the profiler: "profiler_no_memory_usage" + to "profiler_no_memory". +- Fixed an error in the Zip library that didn't allow downloading on + PHP 4 servers. +- Fixed a bug in the Form Validation library where fields passed as + rule parameters were not being translated (#9132) +- Modified inflector helper to properly pluralize words that end in + 'ch' or 'sh' +- Fixed a bug in xss_clean() that was not allowing hyphens in query + strings of submitted URLs. +- Fixed bugs in get_dir_file_info() and get_file_info() in the + File Helper with recursion, and file paths on Windows. +- Fixed a bug where Active Record override parameter would not let you + disable Active Record if it was enabled in your database config file. +- Fixed a bug in reduce_double_slashes() in the String Helper to + properly remove duplicate leading slashes (#7585) +- Fixed a bug in values_parsing() of the XML-RPC library which + prevented NULL variables typed as 'string' from being handled + properly. +- Fixed a bug were form_open_multipart() didn't accept string + attribute arguments (#10930). +- Fixed a bug (#10470) where get_mime_by_extension() was case + sensitive. +- Fixed a bug where some error messages for the SQLite and Oracle + drivers would not display. +- Fixed a bug where files created with the Zip Library would result in + file creation dates of 1980. +- Fixed a bug in the Session library that would result in PHP error + when attempting to store values with objects. +- Fixed a bug where extending the Controller class would result in a + fatal PHP error. +- Fixed a PHP Strict Standards Error in the index.php file. +- Fixed a bug where getimagesize() was being needlessly checked on + non-image files in is_allowed_type(). +- Fixed a bug in the Encryption library where an empty key was not + triggering an error. +- Fixed a bug in the Email library where CC and BCC recipients were not + reset when using the clear() method (#109). +- Fixed a bug in the URL Helper where prep_url() could cause a PHP + error on PHP versions < 5.1.2. +- Added a log message in core/output if the cache directory config + value was not found. +- Fixed a bug where multiple libraries could not be loaded by passing + an array to load->library() +- Fixed a bug in the html helper where too much white space was + rendered between the src and alt tags in the img() function. +- Fixed a bug in the profilers _compile_queries() function. +- Fixed a bug in the date helper where the DATE_ISO8601 variable was + returning an incorrectly formatted date string. + +Version 1.7.2 +============= + +Release Date: September 11, 2009 +Hg Tag: v1.7.2 + +- Libraries + + - Added a new :doc:`Cart Class `. + - Added the ability to pass $config['file_name'] for the :doc:`File + Uploading Class ` and rename the + uploaded file. + - Changed order of listed user-agents so Safari would more + accurately report itself. (#6844) + +- Database + + - Switched from using gettype() in escape() to is\_* methods, since + future PHP versions might change its output. + - Updated all database drivers to handle arrays in escape_str() + - Added escape_like_str() method for escaping strings to be used + in LIKE conditions + - Updated Active Record to utilize the new LIKE escaping mechanism. + - Added reconnect() method to DB drivers to try to keep alive / + reestablish a connection after a long idle. + - Modified MSSQL driver to use mssql_get_last_message() for error + messages. + +- Helpers + + - Added form_multiselect() to the :doc:`Form + helper `. + - Modified form_hidden() in the :doc:`Form + helper ` to accept multi-dimensional + arrays. + - Modified form_prep() in the :doc:`Form + helper ` to keep track of prepped + fields to avoid multiple prep/mutation from subsequent calls which + can occur when using Form Validation and form helper functions to + output form fields. + - Modified directory_map() in the :doc:`Directory + helper ` to allow the inclusion of + hidden files, and to return FALSE on failure to read directory. + - Modified the :doc:`Smiley helper ` to work + with multiple fields and insert the smiley at the last known + cursor position. + +- General + + - Compatible with PHP 5.3.0 + - Modified :doc:`show_error() ` to allow sending + of HTTP server response codes. + - Modified :doc:`show_404() ` to send 404 status + code, removing non-CGI compatible header() statement from + error_404.php template. + - Added set_status_header() to the :doc:`Common + functions ` to allow use when the + Output class is unavailable. + - Added is_php() to :doc:`Common + functions ` to facilitate PHP + version comparisons. + - Added 2 CodeIgniter "cheatsheets" (thanks to DesignFellow.com for + this contribution). + +Bug fixes for 1.7.2 +------------------- + +- Fixed assorted user guide typos or examples (#6743, #7214, #7516, + #7287, #7852, #8224, #8324, #8349). +- Fixed a bug in the Form Validation library where multiple callbacks + weren't working (#6110) +- doctype helper default value was missing a "1". +- Fixed a bug in the language class when outputting an error for an + unfound file. +- Fixed a bug in the Calendar library where the shortname was output + for "May". +- Fixed a bug with ORIG_PATH_INFO that was allowing URIs of just a + slash through. +- Fixed a fatal error in the Oracle and ODBC drivers (#6752) +- Fixed a bug where xml_from_result() was checking for a nonexistent + method. +- Fixed a bug where Database Forge's add_column and modify_column + were not looping through when sent multiple fields. +- Fixed a bug where the File Helper was using '/' instead of the + DIRECTORY_SEPARATOR constant. +- Fixed a bug to prevent PHP errors when attempting to use sendmail on + servers that have manually disabled the PHP popen() function. +- Fixed a bug that would cause PHP errors in XML-RPC data if the PHP + data type did not match the specified XML-RPC type. +- Fixed a bug in the XML-RPC class with parsing dateTime.iso8601 data + types. +- Fixed a case sensitive string replacement in xss_clean() +- Fixed a bug in form_textarea() where form data was not prepped + correctly. +- Fixed a bug in form_prep() causing it to not preserve entities in + the user's original input when called back into a form element +- Fixed a bug in _protect_identifiers() where the swap prefix + ($swap_pre) was not being observed. +- Fixed a bug where the 400 status header sent with the 'disallowed URI + characters' was not compatible with CGI environments. +- Fixed a bug in the typography class where heading tags could have + paragraph tags inserted when using auto_typography(). + +Version 1.7.1 +============= + +Release Date: February 10, 2009 +Hg Tag: 1.7.1 + +- Libraries + + - Fixed an arbitrary script execution security flaw (#6068) in the + Form Validation library (thanks to hkk) + - Changed default current page indicator in the Pagination library + to use instead of + - A "HTTP/1.1 400 Bad Request" header is now sent when disallowed + characters are encountered. + - Added , , , and to the Typography parser's + inline elements. + - Added more accurate error reporting for the Email library when + using sendmail. + - Removed a strict type check from the rotate() function of the + :doc:`Image Manipulation Class `. + - Added enhanced error checking in file saving in the Image library + when using the GD lib. + - Added an additional newline between multipart email headers and + the MIME message text for better compatibility with a variety of + MUAs. + - Made modest improvements to efficiency and accuracy of + explode_name() in the Image lib. + +- Database + + - Added where_in to the list of expected arguments received by + delete(). + +- Helpers + + - Added the ability to have optgroups in form_dropdown() within the + :doc:`form helper `. + - Added a doctype() function to the :doc:`HTML + helper `. + - Added ability to force lowercase for url_title() in the :doc:`URL + helper `. + - Changed the default "type" of form_button() to "button" from + "submit" in the :doc:`form helper `. + - Changed redirect() in the URL helper to allow redirections to URLs + outside of the CI site. + - Updated get_cookie() to try to fetch the cookie using the global + cookie prefix if the requested cookie name doesn't exist. + +- Other Changes + + - Improved security in xss_clean() to help prevent attacks + targeting Internet Explorer. + - Added 'application/msexcel' to config/mimes.php for .xls files. + - Added 'proxy_ips' config item to whitelist reverse proxy servers + from which to trust the HTTP_X_FORWARDED_FOR header to to + determine the visitor's IP address. + - Improved accuracy of Upload::is_allowed_filetype() for images + (#6715) + +Bug fixes for 1.7.1 +------------------- + +- Database + + - Fixed a bug when doing 'random' on order_by() (#5706). + - Fixed a bug where adding a primary key through Forge could fail + (#5731). + - Fixed a bug when using DB cache on multiple databases (#5737). + - Fixed a bug where TRUNCATE was not considered a "write" query + (#6619). + - Fixed a bug where csv_from_result() was checking for a + nonexistent method. + - Fixed a bug _protect_identifiers() where it was improperly + removing all pipe symbols from items + +- Fixed assorted user guide typos or examples (#5998, #6093, #6259, + #6339, #6432, #6521). +- Fixed a bug in the MySQLi driver when no port is specified +- Fixed a bug (#5702), in which the field label was not being fetched + properly, when "matching" one field to another. +- Fixed a bug in which identifers were not being escaped properly when + reserved characters were used. +- Fixed a bug with the regular expression used to protect submitted + paragraph tags in auto typography. +- Fixed a bug where double dashes within tag attributes were being + converted to em dash entities. +- Fixed a bug where double spaces within tag attributes were being + converted to non-breaking space entities. +- Fixed some accuracy issues with curly quotes in + Typography::format_characters() +- Changed a few docblock comments to reflect actual return values. +- Fixed a bug with high ascii characters in subject and from email + headers. +- Fixed a bug in xss_clean() where whitespace following a validated + character entity would not be preserved. +- Fixed a bug where HTML comments and 
 tags were being parsed in
+   Typography::auto_typography().
+-  Fixed a bug with non-breaking space cleanup in
+   Typography::auto_typography().
+-  Fixed a bug in database escaping where a compound statement (ie:
+   SUM()) wasn't handled correctly with database prefixes.
+-  Fixed a bug when an opening quote is preceded by a paragraph tag and
+   immediately followed by another tag.
+-  Fixed a bug in the Text Helper affecting some locales where
+   word_censor() would not work on words beginning or ending with an
+   accented character.
+-  Fixed a bug in the Text Helper character limiter where the provided
+   limit intersects the last word of the string.
+-  Fixed a bug (#6342) with plural() in the Inflection helper with words
+   ending in "y".
+-  Fixed bug (#6517) where Routed URI segments returned by
+   URI::rsegment() method were incorrect for the default controller.
+-  Fixed a bug (#6706) in the Security Helper where xss_clean() was
+   using a deprecated second argument.
+-  Fixed a bug in the URL helper url_title() function where trailing
+   periods were allowed at the end of a URL.
+-  Fixed a bug (#6669) in the Email class when CRLF's are used for the
+   newline character with headers when used with the "mail" protocol.
+-  Fixed a bug (#6500) where URI::A_filter_uri() was exit()ing an
+   error instead of using show_error().
+-  Fixed a bug (#6592) in the File Helper where get_dir_file_info()
+   where recursion was not occurring properly.
+-  Tweaked Typography::auto_typography() for some edge-cases.
+
+Version 1.7
+===========
+
+Release Date: October 23, 2008
+Hg Tag: 1.7.0
+
+-  Libraries
+
+   -  Added a new :doc:`Form Validation
+      Class `. It simplifies setting
+      rules and field names, supports arrays as field names, allows
+      groups of validation rules to be saved in a config file, and adds
+      some helper functions for use in view files. **Please note that
+      the old Validation class is now deprecated**. We will leave it in
+      the library folder for some time so that existing applications
+      that use it will not break, but you are encouraged to migrate to
+      the new version.
+   -  Updated the :doc:`Sessions class ` so that
+      any custom data being saved gets stored to a database rather than
+      the session cookie (assuming you are using a database to store
+      session data), permitting much more data to be saved.
+   -  Added the ability to store libraries in subdirectories within
+      either the main "libraries" or the local application "libraries"
+      folder. Please see the :doc:`Loader class ` for
+      more info.
+   -  Added the ability to assign library objects to your own variable
+      names when you use $this->load->library(). Please see the :doc:`Loader
+      class ` for more info.
+   -  Added controller class/method info to :doc:`Profiler
+      class ` and support for multiple database
+      connections.
+   -  Improved the "auto typography" feature and moved it out of the
+      helper into its own :doc:`Typography
+      Class `.
+   -  Improved performance and accuracy of xss_clean(), including
+      reduction of false positives on image/file tests.
+   -  Improved :doc:`Parser class <./libraries/parser>` to allow
+      multiple calls to the parse() function. The output of each is
+      appended in the output.
+   -  Added max_filename option to set a file name length limit in the
+      :doc:`File Upload Class `.
+   -  Added set_status_header() function to :doc:`Output
+      class `.
+   -  Modified :doc:`Pagination ` class to only
+      output the "First" link when the link for page one would not be
+      shown.
+   -  Added support for mb_strlen in the :doc:`Form
+      Validation ` class so that
+      multi-byte languages will calculate string lengths properly.
+
+-  Database
+
+   -  Improved Active Record class to allow full path column and table
+      names: hostname.database.table.column. Also improved the alias
+      handling.
+   -  Improved how table and column names are escaped and prefixed. It
+      now honors full path names when adding prefixes and escaping.
+   -  Added Active Record caching feature to "update" and "delete"
+      functions.
+   -  Added removal of non-printing control characters in escape_str()
+      of DB drivers that do not have native PHP escaping mechanisms
+      (mssql, oci8, odbc), to avoid potential SQL errors, and possible
+      sources of SQL injection.
+   -  Added port support to MySQL, MySQLi, and MS SQL database drivers.
+   -  Added driver name variable in each DB driver, based on bug report
+      #4436.
+
+-  Helpers
+
+   -  Added several new "setting" functions to the :doc:`Form
+      helper ` that allow POST data to be
+      retrieved and set into forms. These are intended to be used on
+      their own, or with the new :doc:`Form Validation
+      Class `.
+   -  Added current_url() and uri_segments() to :doc:`URL
+      helper `.
+   -  Altered auto_link() in the :doc:`URL
+      helper ` so that email addresses with
+      "+" included will be linked.
+   -  Added meta() function to :doc:`HTML
+      helper `.
+   -  Improved accuracy of calculations in :doc:`Number
+      helper `.
+   -  Removed added newlines ("\\n") from most form and html helper
+      functions.
+   -  Tightened up validation in the :doc:`Date
+      helper ` function human_to_unix(),
+      and eliminated the POSIX regex.
+   -  Updated :doc:`Date helper ` to match the
+      world's current time zones and offsets.
+   -  Modified url_title() in the :doc:`URL
+      helper ` to remove characters and digits
+      that are part of character entities, to allow dashes, underscores,
+      and periods regardless of the $separator, and to allow uppercase
+      characters.
+   -  Added support for arbitrary attributes in anchor_popup() of the
+      :doc:`URL helper `.
+
+-  Other Changes
+
+   -  Added :doc:`PHP Style Guide <./general/styleguide>` to docs.
+   -  Added sanitization in xss_clean() for a deprecated HTML tag that
+      could be abused in user input in Internet Explorer.
+   -  Added a few openxml document mime types, and an additional mobile
+      agent to mimes.php and user_agents.php respectively.
+   -  Added a file lock check during caching, before trying to write to
+      the file.
+   -  Modified Cookie key cleaning to unset a few troublesome key names
+      that can be present in certain environments, preventing CI from
+      halting execution.
+   -  Changed the output of the profiler to use style attribute rather
+      than clear, and added the id "codeigniter_profiler" to the
+      container div.
+
+Bug fixes for 1.7.0
+-------------------
+
+-  Fixed bug in xss_clean() that could remove some desirable tag
+   attributes.
+-  Fixed assorted user guide typos or examples (#4807, #4812, #4840,
+   #4862, #4864, #4899, #4930, #5006, #5071, #5158, #5229, #5254,
+   #5351).
+-  Fixed an edit from 1.6.3 that made the $robots array in
+   user_agents.php go poof.
+-  Fixed a bug in the :doc:`Email library ` with
+   quoted-printable encoding improperly encoding space and tab
+   characters.
+-  Modified XSS sanitization to no longer add semicolons after &[single
+   letter], such as in M&M's, B&B, etc.
+-  Modified XSS sanitization to no longer strip XHTML image tags of
+   closing slashes.
+-  Fixed a bug in the Session class when database sessions are used
+   where upon session update all userdata would be errantly written to
+   the session cookie.
+-  Fixed a bug (#4536) in backups with the MySQL driver where some
+   legacy code was causing certain characters to be double escaped.
+-  Fixed a routing bug (#4661) that occurred when the default route
+   pointed to a subfolder.
+-  Fixed the spelling of "Dhaka" in the timezone_menu() function of the
+   :doc:`Date helper. `
+-  Fixed the spelling of "raspberry" in config/smileys.php.
+-  Fixed incorrect parenthesis in form_open() function (#5135).
+-  Fixed a bug that was ignoring case when comparing controller methods
+   (#4560).
+-  Fixed a bug (#4615) that was not setting SMTP authorization settings
+   when using the initialize function.
+-  Fixed a bug in highlight_code() in the :doc:`Text
+   helper ` that would leave a stray 
+   in certain cases.
+-  Fixed Oracle bug (#3306) that was preventing multiple queries in one
+   action.
+-  Fixed ODBC bug that was ignoring connection params due to its use of
+   a constructor.
+-  Fixed a DB driver bug with num_rows() that would cause an error with
+   the Oracle driver.
+-  Fixed MS SQL bug (#4915). Added brackets around database name in MS
+   SQL driver when selecting the database, in the event that reserved
+   characters are used in the name.
+-  Fixed a DB caching bug (4718) in which the path was incorrect when no
+   URI segments were present.
+-  Fixed Image_lib class bug #4562. A path was not defined for NetPBM.
+-  Fixed Image_lib class bug #4532. When cropping an image with
+   identical height/width settings on output, a copy is made.
+-  Fixed DB_driver bug (4900), in which a database error was not being
+   logged correctly.
+-  Fixed DB backup bug in which field names were not being escaped.
+-  Fixed a DB Active Record caching bug in which multiple calls to
+   cached data were not being honored.
+-  Fixed a bug in the Session class that was disallowing slashes in the
+   serialized array.
+-  Fixed a Form Validation bug in which the "isset" error message was
+   being trigged by the "required" rule.
+-  Fixed a spelling error in a Loader error message.
+-  Fixed a bug (5050) with IP validation with empty segments.
+-  Fixed a bug in which the parser was being greedy if multiple
+   identical sets of tags were encountered.
+
+Version 1.6.3
+=============
+
+Release Date: June 26, 2008
+Hg Tag: v1.6.3
+
+Version 1.6.3 is a security and maintenance release and is recommended
+for all users.
+
+-  Database
+
+   -  Modified MySQL/MySQLi Forge class to give explicit names to keys
+   -  Added ability to set multiple column non-primary keys to the
+      :doc:`Forge class `
+   -  Added ability to set additional database config values in :doc:`DSN
+      connections ` via the query string.
+
+-  Libraries
+
+   -  Set the mime type check in the :doc:`Upload
+      class ` to reference the global
+      mimes variable.
+   -  Added support for query strings to the :doc:`Pagination
+      class `, automatically detected or
+      explicitly declared.
+   -  Added get_post() to the :doc:`Input class `.
+   -  Documented get() in the :doc:`Input class `.
+   -  Added the ability to automatically output language items as form
+      labels in the :doc:`Language class `.
+
+-  Helpers
+
+   -  Added a :doc:`Language helper `.
+   -  Added a :doc:`Number helper `.
+   -  :doc:`Form helper ` refactored to allow
+      form_open() and form_fieldset() to accept arrays or strings as
+      arguments.
+
+-  Other changes
+
+   -  Improved security in xss_clean().
+   -  Removed an unused Router reference in _display_cache().
+   -  Added ability to :doc:`use xss_clean() to test
+      images ` for XSS, useful for upload
+      security.
+   -  Considerably expanded list of mobile user-agents in
+      config/user_agents.php.
+   -  Charset information in the userguide has been moved above title
+      for internationalization purposes (#4614).
+   -  Added "Using Associative Arrays In a Request Parameter" example to
+      the :doc:`XMLRPC userguide page `.
+   -  Removed maxlength and size as automatically added attributes of
+      form_input() in the :doc:`form helper `.
+   -  Documented the language file use of byte_format() in the :doc:`number
+      helper `.
+
+Bug fixes for 1.6.3
+-------------------
+
+-  Added a language key for valid_emails in validation_lang.php.
+-  Amended fixes for bug (#3419) with parsing DSN database connections.
+-  Moved the _has_operators() function (#4535) into DB_driver from
+   DB_active_rec.
+-  Fixed a syntax error in upload_lang.php.
+-  Fixed a bug (#4542) with a regular expression in the Image library.
+-  Fixed a bug (#4561) where orhaving() wasn't properly passing values.
+-  Removed some unused variables from the code (#4563).
+-  Fixed a bug where having() was not adding an = into the statement
+   (#4568).
+-  Fixed assorted user guide typos or examples (#4574, #4706).
+-  Added quoted-printable headers to Email class when the multi-part
+   override is used.
+-  Fixed a double opening 
 tag in the index pages of each system
+   directory.
+
+Version 1.6.2
+=============
+
+Release Date: May 13, 2008
+Hg Tag: 1.6.2
+
+-  Active Record
+
+   -  Added the ability to prevent escaping in having() clauses.
+   -  Added rename_table() into :doc:`DBForge <./database/forge>`.
+   -  Fixed a bug that wasn't allowing escaping to be turned off if the
+      value of a query was NULL.
+   -  DB Forge is now assigned to any models that exist after loading
+      (#3457).
+
+-  Database
+
+   -  Added :doc:`Strict Mode <./database/transactions>` to database
+      transactions.
+   -  Escape behaviour in where() clauses has changed; values in those
+      with the "FALSE" argument are no longer escaped (ie: quoted).
+
+-  Config
+
+   -  Added 'application/vnd.ms-powerpoint' to list of mime types.
+   -  Added 'audio/mpg' to list of mime types.
+   -  Added new user-modifiable file constants.php containing file mode
+      and fopen constants.
+   -  Added the ability to set CRLF settings via config in the
+      :doc:`Email ` class.
+
+-  Libraries
+
+   -  Added increased security for filename handling in the Upload
+      library.
+   -  Added increased security for sessions for client-side data
+      tampering.
+   -  The MySQLi forge class is now in sync with MySQL forge.
+   -  Added the ability to set CRLF settings via config in the
+      :doc:`Email ` class.
+   -  :doc:`Unit Testing ` results are now
+      colour coded, and a change was made to the default template of
+      results.
+   -  Added a valid_emails rule to the Validation class.
+   -  The :doc:`Zip class ` now exits within download().
+   -  The :doc:`Zip class ` has undergone a substantial
+      re-write for speed and clarity (thanks stanleyxu for the hard work
+      and code contribution in bug report #3425!)
+
+-  Helpers
+
+   -  Added a Compatibility
+      Helper for using some common
+      PHP 5 functions safely in applications that might run on PHP 4
+      servers (thanks Seppo for the hard work and code contribution!)
+   -  Added form_button() in the :doc:`Form
+      helper `.
+   -  Changed the radio() and checkbox() functions to default to not
+      checked by default.
+   -  Added the ability to include an optional HTTP Response Code in the
+      redirect() function of the :doc:`URL
+      Helper `.
+   -  Modified img() in the :doc:`HTML Helper ` to
+      remove an unneeded space (#4208).
+   -  Modified anchor() in the :doc:`URL helper `
+      to no longer add a default title= attribute (#4209).
+   -  The :doc:`Download helper ` now exits
+      within force_download().
+   -  Added get_dir_file_info(), get_file_info(), and
+      get_mime_by_extension() to the :doc:`File
+      Helper `.
+   -  Added symbolic_permissions() and octal_permissions() to the
+      :doc:`File helper `.
+
+-  Plugins
+
+   -  Modified captcha generation to first look for the function
+      imagecreatetruecolor, and fallback to imagecreate if it isn't
+      available (#4226).
+
+-  Other Changes
+
+   -  Added ability for :doc:`xss_clean() ` to accept
+      arrays.
+   -  Removed closing PHP tags from all PHP files to avoid accidental
+      output and potential 'cannot modify headers' errors.
+   -  Removed "scripts" from the auto-load search path. Scripts were
+      deprecated in Version 1.4.1 (September 21, 2006). If you still
+      need to use them for legacy reasons, they must now be manually
+      loaded in each Controller.
+   -  Added a :doc:`Reserved Names ` page to
+      the userguide, and migrated reserved controller names into it.
+   -  Added a :doc:`Common Functions ` page
+      to the userguide for globally available functions.
+   -  Improved security and performance of xss_clean().
+
+Bugfixes for 1.6.2
+------------------
+
+-  Fixed a bug where SET queries were not being handled as "write"
+   queries.
+-  Fixed a bug (#3191) with ORIG_PATH_INFO URI parsing.
+-  Fixed a bug in DB Forge, when inserting an id field (#3456).
+-  Fixed a bug in the table library that could cause identically
+   constructed rows to be dropped (#3459).
+-  Fixed DB Driver and MySQLi result driver checking for resources
+   instead of objects (#3461).
+-  Fixed an AR_caching error where it wasn't tracking table aliases
+   (#3463).
+-  Fixed a bug in AR compiling, where select statements with arguments
+   got incorrectly escaped (#3478).
+-  Fixed an incorrect documentation of $this->load->language (#3520).
+-  Fixed bugs (#3523, #4350) in get_filenames() with recursion and
+   problems with Windows when $include_path is used.
+-  Fixed a bug (#4153) in the XML-RPC class preventing dateTime.iso8601
+   from being used.
+-  Fixed an AR bug with or_where_not_in() (#4171).
+-  Fixed a bug with :doc:`xss_clean() ` that would
+   add semicolons to GET URI variable strings.
+-  Fixed a bug (#4206) in the Directory Helper where the directory
+   resource was not being closed, and minor improvements.
+-  Fixed a bug in the FTP library where delete_dir() was not working
+   recursively (#4215).
+-  Fixed a Validation bug when set_rules() is used with a non-array
+   field name and rule (#4220).
+-  Fixed a bug (#4223) where DB caching would not work for returned DB
+   objects or multiple DB connections.
+-  Fixed a bug in the Upload library that might output the same error
+   twice (#4390).
+-  Fixed an AR bug when joining with a table alias and table prefix
+   (#4400).
+-  Fixed a bug in the DB class testing the $params argument.
+-  Fixed a bug in the Table library where the integer 0 in cell data
+   would be displayed as a blank cell.
+-  Fixed a bug in link_tag() of the :doc:`URL
+   helper ` where a key was passed instead of
+   a value.
+-  Fixed a bug in DB_result::row() that prevented it from returning
+   individual fields with MySQL NULL values.
+-  Fixed a bug where SMTP emails were not having dot transformation
+   performed on lines that begin with a dot.
+-  Fixed a bug in display_error() in the DB driver that was
+   instantiating new Language and Exception objects, and not using the
+   error heading.
+-  Fixed a bug (#4413) where a URI containing slashes only e.g.
+   'http://example.com/index.php?//' would result in PHP errors
+-  Fixed an array to string conversion error in the Validation library
+   (#4425)
+-  Fixed bug (#4451, #4299, #4339) where failed transactions will not
+   rollback when debug mode is enabled.
+-  Fixed a bug (#4506) with overlay_watermark() in the Image library
+   preventing support for PNG-24s with alpha transparency
+-  Fixed assorted user guide typos (#3453, #4364, #4379, #4399, #4408,
+   #4412, #4448, #4488).
+
+Version 1.6.1
+=============
+
+Release Date: February 12, 2008
+Hg Tag: 1.6.1
+
+-  Active Record
+
+   -  Added :ref:`Active Record
+      Caching `.
+   -  Made Active Record fully database-prefix aware.
+
+-  Database drivers
+
+   -  Added support for setting client character set and collation for
+      MySQLi.
+
+-  Core Changes
+
+   -  Modified xss_clean() to be more intelligent with its handling of
+      URL encoded strings.
+   -  Added $_SERVER, $_FILES, $_ENV, and $_SESSION to sanitization
+      of globals.
+   -  Added a `Path Helper <./helpers/path_helper>`.
+   -  Simplified _reindex_segments() in the URI class.
+   -  Escaped the '-' in the default 'permitted_uri_chars' config
+      item, to prevent errors if developers just try to add additional
+      characters to the end of the default expression.
+   -  Modified method calling to controllers to show a 404 when a
+      private or protected method is accessed via a URL.
+   -  Modified framework initiated 404s to log the controller and method
+      for invalid requests.
+
+-  Helpers
+
+   -  Modified get_filenames() in the File Helper to return FALSE if
+      the $source_dir is not readable.
+
+Bugfixes for 1.6.1
+------------------
+
+-  Deprecated is_numeric as a validation rule. Use of numeric and
+   integer are preferred.
+-  Fixed bug (#3379) in DBForge with SQLite for table creation.
+-  Made Active Record fully database prefix aware (#3384).
+-  Fixed a bug where DBForge was outputting invalid SQL in Postgres by
+   adding brackets around the tables in FROM.
+-  Changed the behaviour of Active Record's update() to make the WHERE
+   clause optional (#3395).
+-  Fixed a bug (#3396) where certain POST variables would cause a PHP
+   warning.
+-  Fixed a bug in query binding (#3402).
+-  Changed order of SQL keywords in the Profiler $highlight array so OR
+   would not be highlighted before ORDER BY.
+-  Fixed a bug (#3404) where the MySQLi driver was testing if
+   $this->conn_id was a resource instead of an object.
+-  Fixed a bug (#3419) connecting to a database via a DSN string.
+-  Fixed a bug (#3445) where the routed segment array was not re-indexed
+   to begin with 1 when the default controller is used.
+-  Fixed assorted user guide typos.
+
+Version 1.6.0
+=============
+
+Release Date: January 30, 2008
+
+-  DBForge
+
+   -  Added :doc:`DBForge <./database/forge>` to the database tools.
+   -  Moved create_database() and drop_database() into
+      :doc:`DBForge <./database/forge>`.
+   -  Added add_field(), add_key(), create_table(), drop_table(),
+      add_column(), drop_column(), modify_column() into
+      :doc:`DBForge <./database/forge>`.
+
+-  Active Record
+
+   -  Added protect_identifiers() in :doc:`Active
+      Record <./database/active_record>`.
+   -  All AR queries are backticked if appropriate to the database.
+   -  Added where_in(), or_where_in(), where_not_in(),
+      or_where_not_in(), not_like() and or_not_like() to :doc:`Active
+      Record <./database/active_record>`.
+   -  Added support for limit() into update() and delete() statements in
+      :doc:`Active Record <./database/active_record>`.
+   -  Added empty_table() and truncate_table() to :doc:`Active
+      Record <./database/active_record>`.
+   -  Added the ability to pass an array of tables to the delete()
+      statement in :doc:`Active Record <./database/active_record>`.
+   -  Added count_all_results() function to :doc:`Active
+      Record <./database/active_record>`.
+   -  Added select_max(), select_min(), select_avg() and
+      select_sum() to :doc:`Active Record <./database/active_record>`.
+   -  Added the ability to use aliases with joins in :doc:`Active
+      Record <./database/active_record>`.
+   -  Added a third parameter to Active Record's like() clause to
+      control where the wildcard goes.
+   -  Added a third parameter to set() in :doc:`Active
+      Record <./database/active_record>` that withholds escaping
+      data.
+   -  Changed the behaviour of variables submitted to the where() clause
+      with no values to auto set "IS NULL"
+
+-  Other Database Related
+
+   -  MySQL driver now requires MySQL 4.1+
+   -  Added $this->DB->save_queries variable to DB driver, enabling
+      queries to get saved or not. Previously they were always saved.
+   -  Added $this->db->dbprefix() to manually add database prefixes.
+   -  Added 'random' as an order_by() option , and removed "rand()" as
+      a listed option as it was MySQL only.
+   -  Added a check for NULL fields in the MySQL database backup
+      utility.
+   -  Added "constrain_by_prefix" parameter to db->list_table()
+      function. If set to TRUE it will limit the result to only table
+      names with the current prefix.
+   -  Deprecated from Active Record; getwhere() for get_where();
+      groupby() for group_by(); havingor() for having_or(); orderby()
+      for order_by; orwhere() for or_where(); and orlike() for
+      or_like().
+   -  Modified csv_from_result() to output CSV data more in the spirit
+      of basic rules of RFC 4180.
+   -  Added 'char_set' and 'dbcollat' database configuration settings,
+      to explicitly set the client communication properly.
+   -  Removed 'active_r' configuration setting and replaced with a
+      global $active_record setting, which is more in harmony with the
+      global nature of the behavior (#1834).
+
+-  Core changes
+
+   -  Added ability to load multiple views, whose content will be
+      appended to the output in the order loaded.
+   -  Added the ability to :doc:`auto-load <./general/autoloader>`
+      :doc:`Models <./general/models>`.
+   -  Reorganized the URI and Routes classes for better clarity.
+   -  Added Compat.php to allow function overrides for older versions of
+      PHP or PHP environments missing certain extensions / libraries
+   -  Added memory usage, GET, URI string data, and individual query
+      execution time to Profiler output.
+   -  Deprecated Scaffolding.
+   -  Added is_really_writable() to Common.php to provide a
+      cross-platform reliable method of testing file/folder writability.
+
+-  Libraries
+
+   -  Changed the load protocol of Models to allow for extension.
+   -  Strengthened the Encryption library to help protect against man in
+      the middle attacks when MCRYPT_MODE_CBC mode is used.
+   -  Added Flashdata variables, session_id regeneration and
+      configurable session update times to the :doc:`Session
+      class. <./libraries/sessions>`
+   -  Removed 'last_visit' from the Session class.
+   -  Added a language entry for valid_ip validation error.
+   -  Modified prep_for_form() in the Validation class to accept
+      arrays, adding support for POST array validation (via callbacks
+      only)
+   -  Added an "integer" rule into the Validation library.
+   -  Added valid_base64() to the Validation library.
+   -  Documented clear() in the :doc:`Image
+      Processing <../libraries/image_lib>` library.
+   -  Changed the behaviour of custom callbacks so that they no longer
+      trigger the "required" rule.
+   -  Modified Upload class $_FILES error messages to be more precise.
+   -  Moved the safe mode and auth checks for the Email library into the
+      constructor.
+   -  Modified variable names in _ci_load() method of Loader class to
+      avoid conflicts with view variables.
+   -  Added a few additional mime type variations for CSV.
+   -  Enabled the 'system' methods for the XML-RPC Server library,
+      except for 'system.multicall' which is still disabled.
+
+-  Helpers & Plugins
+
+   -  Added link_tag() to the :doc:`HTML
+      helper. <./helpers/html_helper>`
+   -  Added img() to the :doc:`HTML helper. <./helpers/html_helper>`
+   -  Added ability to :doc:`"extend" Helpers <./general/helpers>`.
+   -  Added an :doc:`email helper <./helpers/email_helper>` into core
+      helpers.
+   -  Added strip_quotes() function to :doc:`string
+      helper <./helpers/string_helper>`.
+   -  Added reduce_multiples() function to :doc:`string
+      helper <./helpers/string_helper>`.
+   -  Added quotes_to_entities() function to :doc:`string
+      helper <./helpers/string_helper>`.
+   -  Added form_fieldset(), form_fieldset_close(), form_label(),
+      and form_reset() function to :doc:`form
+      helper <./helpers/form_helper>`.
+   -  Added support for external urls in form_open().
+   -  Removed support for db_backup in MySQLi due to incompatible
+      functions.
+   -  Javascript Calendar plugin now uses the months and days from the
+      calendar language file, instead of hard-coded values,
+      internationalizing it.
+
+-  Documentation Changes
+
+   -  Added Writing Documentation section
+      for the community to use in writing their own documentation.
+   -  Added titles to all user manual pages.
+   -  Added attributes into  of userguide for valid html.
+   -  Added `Zip Encoding
+      Class `_ to
+      the table of contents of the userguide.
+   -  Moved part of the userguide menu javascript to an external file.
+   -  Documented distinct() in :doc:`Active
+      Record <./database/active_record>`.
+   -  Documented the timezones() function in the :doc:`Date
+      Helper <./helpers/date_helper>`.
+   -  Documented unset_userdata in the :doc:`Session
+      class <./libraries/sessions>`.
+   -  Documented 2 config options to the :doc:`Database
+      configuration <./database/configuration>` page.
+
+Bug fixes for Version 1.6.0
+---------------------------
+
+-  Fixed a bug (#1813) preventing using $CI->db in the same application
+   with returned database objects.
+-  Fixed a bug (#1842) where the $this->uri->rsegments array would not
+   include the 'index' method if routed to the controller without an
+   implicit method.
+-  Fixed a bug (#1872) where word_limiter() was not retaining
+   whitespace.
+-  Fixed a bug (#1890) in csv_from_result() where content that
+   included the delimiter would break the file.
+-  Fixed a bug (#2542)in the clean_email() method of the Email class to
+   allow for non-numeric / non-sequential array keys.
+-  Fixed a bug (#2545) in _html_entity_decode_callback() when
+   'global_xss_filtering' is enabled.
+-  Fixed a bug (#2668) in the :doc:`parser class <./libraries/parser>`
+   where numeric data was ignored.
+-  Fixed a bug (#2679) where the "previous" pagination link would get
+   drawn on the first page.
+-  Fixed a bug (#2702) in _object_to_array that broke some types of
+   inserts and updates.
+-  Fixed a bug (#2732) in the SQLite driver for PHP 4.
+-  Fixed a bug (#2754) in Pagination to scan for non-positive
+   num_links.
+-  Fixed a bug (#2762) in the :doc:`Session
+   library <./libraries/sessions>` where user agent matching would
+   fail on user agents ending with a space.
+-  Fixed a bug (#2784) $field_names[] vs $Ffield_names[] in postgres
+   and sqlite drivers.
+-  Fixed a bug (#2810) in the typography helper causing extraneous
+   paragraph tags when string contains tags.
+-  Fixed a bug (#2849) where arguments passed to a subfolder controller
+   method would be incorrectly shifted, dropping the 3rd segment value.
+-  Fixed a bug (#2858) which referenced a wrong variable in the Image
+   class.
+-  Fixed a bug (#2875)when loading plugin files as _plugin. and not
+   _pi.
+-  Fixed a bug (#2912) in get_filenames() in the :doc:`File
+   Helper ` where the array wasn't cleared
+   after each call.
+-  Fixed a bug (#2974) in highlight_phrase() that caused an error with
+   slashes.
+-  Fixed a bug (#3003) in the Encryption Library to support modes other
+   than MCRYPT_MODE_ECB
+-  Fixed a bug (#3015) in the :doc:`User Agent
+   library <./libraries/user_agent>` where more then 2 languages
+   where not reported with languages().
+-  Fixed a bug (#3017) in the :doc:`Email <./libraries/email>` library
+   where some timezones were calculated incorrectly.
+-  Fixed a bug (#3024) in which master_dim wasn't getting reset by
+   clear() in the Image library.
+-  Fixed a bug (#3156) in Text Helper highlight_code() causing PHP tags
+   to be handled incorrectly.
+-  Fixed a bug (#3166) that prevented num_rows from working in Oracle.
+-  Fixed a bug (#3175) preventing certain libraries from working
+   properly when autoloaded in PHP 4.
+-  Fixed a bug (#3267) in the Typography Helper where unordered list was
+   listed "un.
+-  Fixed a bug (#3268) where the Router could leave '/' as the path.
+-  Fixed a bug (#3279) where the Email class was sending the wrong
+   Content-Transfer-Encoding for some character sets.
+-  Fixed a bug (#3284) where the rsegment array would not be set
+   properly if the requested URI contained more segments than the routed
+   URI.
+-  Removed extraneous load of $CFG in _display_cache() of the Output
+   class (#3285).
+-  Removed an extraneous call to loading models (#3286).
+-  Fixed a bug (#3310) with sanitization of globals in the Input class
+   that could unset CI's global variables.
+-  Fixed a bug (#3314) which would cause the top level path to be
+   deleted in delete_files() of the File helper.
+-  Fixed a bug (#3328) where the smiley helper might return an undefined
+   variable.
+-  Fixed a bug (#3330) in the FTP class where a comparison wasn't
+   getting made.
+-  Removed an unused parameter from Profiler (#3332).
+-  Fixed a bug in database driver where num_rows property wasn't
+   getting updated.
+-  Fixed a bug in the :doc:`upload
+   library <./libraries/file_uploading>` when allowed_files
+   wasn't defined.
+-  Fixed a bug in word_wrap() of the Text Helper that incorrectly
+   referenced an object.
+-  Fixed a bug in Validation where valid_ip() wasn't called properly.
+-  Fixed a bug in Validation where individual error messages for
+   checkboxes wasn't supported.
+-  Fixed a bug in captcha calling an invalid PHP function.
+-  Fixed a bug in the cookie helper "set_cookie" function. It was not
+   honoring the config settings.
+-  Fixed a bug that was making validation callbacks required even when
+   not set as such.
+-  Fixed a bug in the XML-RPC library so if a type is specified, a more
+   intelligent decision is made as to the default type.
+-  Fixed an example of comma-separated emails in the email library
+   documentation.
+-  Fixed an example in the Calendar library for Showing Next/Previous
+   Month Links.
+-  Fixed a typo in the database language file.
+-  Fixed a typo in the image language file "suppor" to "support".
+-  Fixed an example for XML RPC.
+-  Fixed an example of accept_charset() in the :doc:`User Agent
+   Library <./libraries/user_agent>`.
+-  Fixed a typo in the docblock comments that had CodeIgniter spelled
+   CodeIgnitor.
+-  Fixed a typo in the :doc:`String Helper <./helpers/string_helper>`
+   (uniquid changed to uniqid).
+-  Fixed typos in the email Language class
+   (email_attachment_unredable, email_filed_smtp_login), and FTP
+   Class (ftp_unable_to_remame).
+-  Added a stripslashes() into the Upload Library.
+-  Fixed a series of grammatical and spelling errors in the language
+   files.
+-  Fixed assorted user guide typos.
+
+Version 1.5.4
+=============
+
+Release Date: July 12, 2007
+
+-  Added :doc:`custom Language files <./libraries/language>` to the
+   :doc:`autoload <./general/autoloader>` options.
+-  Added stripslashes() to the _clean_input_data() function in the
+   :doc:`Input class <./libraries/input>` when magic quotes is on so
+   that data will always be un-slashed within the framework.
+-  Added array to string into the :doc:`profiler `.
+-  Added some additional mime types in application/config/mimes.php.
+-  Added filename_security() method to :doc:`Input
+   library <./libraries/input>`.
+-  Added some additional arguments to the :doc:`Inflection
+   helper <./helpers/inflector_helper>` singular() to compensate
+   for words ending in "s". Also added a force parameter to pluralize().
+-  Added $config['charset'] to the config file. Default value is
+   'UTF-8', used in some string handling functions.
+-  Fixed MSSQL insert_id().
+-  Fixed a logic error in the DB trans_status() function. It was
+   incorrectly returning TRUE on failure and FALSE on success.
+-  Fixed a bug that was allowing multiple load attempts on extended
+   classes.
+-  Fixed a bug in the bootstrap file that was incorrectly attempting to
+   discern the full server path even when it was explicity set by the
+   user.
+-  Fixed a bug in the escape_str() function in the MySQL driver.
+-  Fixed a typo in the :doc:`Calendar library <./libraries/calendar>`
+-  Fixed a typo in rpcs.php library
+-  Fixed a bug in the :doc:`Zip library <./libraries/zip>`, providing
+   PC Zip file compatibility with Mac OS X
+-  Fixed a bug in router that was ignoring the scaffolding route for
+   optimization
+-  Fixed an IP validation bug.
+-  Fixed a bug in display of POST keys in the
+   :doc:`Profiler <./general/profiling>` output
+-  Fixed a bug in display of queries with characters that would be
+   interpreted as HTML in the :doc:`Profiler <./general/profiling>`
+   output
+-  Fixed a bug in display of Email class print debugger with characters
+   that would be interpreted as HTML in the debugging output
+-  Fixed a bug in the Content-Transfer-Encoding of HTML emails with the
+   quoted-printable MIME type
+-  Fixed a bug where one could unset certain PHP superglobals by setting
+   them via GET or POST data
+-  Fixed an undefined function error in the insert_id() function of the
+   PostgreSQL driver
+-  Fixed various doc typos.
+-  Documented two functions from the :doc:`String
+   helper <./helpers/string_helper>` that were missing from the
+   user guide: trim_slashes() and reduce_double_slashes().
+-  Docs now validate to XHTML 1 transitional
+-  Updated the XSS Filtering to take into account the IE expression()
+   ability and improved certain deletions to prevent possible exploits
+-  Modified the Router so that when Query Strings are Enabled, the
+   controller trigger and function trigger values are sanitized for
+   filename include security.
+-  Modified the is_image() method in the Upload library to take into
+   account Windows IE 6/7 eccentricities when dealing with MIMEs
+-  Modified XSS Cleaning routine to be more performance friendly and
+   compatible with PHP 5.2's new PCRE backtrack and recursion limits.
+-  Modified the :doc:`URL Helper <./helpers/url_helper>` to type cast
+   the $title as a string in case a numeric value is supplied
+-  Modified Form Helper form_dropdown() to type cast the keys and
+   values of the options array as strings, allowing numeric values to be
+   properly set as 'selected'
+-  Deprecated the use if is_numeric() in various places since it allows
+   periods. Due to compatibility problems with ctype_digit(), making it
+   unreliable in some installations, the following regular expression
+   was used instead: preg_match("/[^0-9]/", $n)
+-  Deprecated: APPVER has been deprecated and replaced with CI_VERSION
+   for clarity.
+
+Version 1.5.3
+=============
+
+Release Date: April 15, 2007
+
+-  Added array to string into the profiler
+-  Code Igniter references updated to CodeIgniter
+-  pMachine references updated to EllisLab
+-  Fixed a bug in the repeater function of :doc:`string
+   helper <./helpers/string_helper>`.
+-  Fixed a bug in ODBC driver
+-  Fixed a bug in result_array() that was returning an empty array when
+   no result is produced.
+-  Fixed a bug in the redirect function of the :doc:`url
+   helper <./helpers/url_helper>`.
+-  Fixed an undefined variable in Loader
+-  Fixed a version bug in the Postgres driver
+-  Fixed a bug in the textarea function of the form helper for use with
+   strings
+-  Fixed doc typos.
+
+Version 1.5.2
+=============
+
+Release Date: February 13, 2007
+
+-  Added subversion information
+   to the `downloads ` page.
+-  Added support for captions in the :doc:`Table
+   Library <./libraries/table>`
+-  Fixed a bug in the
+   :doc:`download_helper ` that was causing
+   Internet Explorer to load rather than download
+-  Fixed a bug in the Active Record Join function that was not taking
+   table prefixes into consideration.
+-  Removed unescaped variables in error messages of Input and Router
+   classes
+-  Fixed a bug in the Loader that was causing errors on Libraries loaded
+   twice. A debug message is now silently made in the log.
+-  Fixed a bug in the :doc:`form helper ` that
+   gave textarea a value attribute
+-  Fixed a bug in the :doc:`Image Library ` that
+   was ignoring resizing the same size image
+-  Fixed some doc typos.
+
+Version 1.5.1
+=============
+
+Release Date: November 23, 2006
+
+-  Added support for submitting arrays of libraries in the
+   $this->load->library function.
+-  Added support for naming custom library files in lower or uppercase.
+-  Fixed a bug related to output buffering.
+-  Fixed a bug in the active record class that was not resetting query
+   data after a completed query.
+-  Fixed a bug that was suppressing errors in controllers.
+-  Fixed a problem that can cause a loop to occur when the config file
+   is missing.
+-  Fixed a bug that occurred when multiple models were loaded with the
+   third parameter set to TRUE.
+-  Fixed an oversight that was not unsetting globals properly in the
+   input sanitize function.
+-  Fixed some bugs in the Oracle DB driver.
+-  Fixed an incorrectly named variable in the MySQLi result driver.
+-  Fixed some doc typos.
+
+Version 1.5.0.1
+===============
+
+Release Date: October 31, 2006
+
+-  Fixed a problem in which duplicate attempts to load helpers and
+   classes were not being stopped.
+-  Fixed a bug in the word_wrap() helper function.
+-  Fixed an invalid color Hex number in the Profiler class.
+-  Fixed a corrupted image in the user guide.
+
+Version 1.5.0
+=============
+
+Release Date: October 30, 2006
+
+-  Added `DB utility class <./database/utilities>`, permitting DB
+   backups, CVS or XML files from DB results, and various other
+   functions.
+-  Added :doc:`Database Caching Class <./database/caching>`.
+-  Added :doc:`transaction support <./database/transactions>` to the
+   database classes.
+-  Added :doc:`Profiler Class <./general/profiling>` which generates a
+   report of Benchmark execution times, queries, and POST data at the
+   bottom of your pages.
+-  Added :doc:`User Agent Library <./libraries/user_agent>` which
+   allows browsers, robots, and mobile devises to be identified.
+-  Added :doc:`HTML Table Class <./libraries/table>` , enabling tables
+   to be generated from arrays or database results.
+-  Added :doc:`Zip Encoding Library <./libraries/zip>`.
+-  Added :doc:`FTP Library <./libraries/ftp>`.
+-  Added the ability to :doc:`extend
+   libraries <./general/creating_libraries>` and :doc:`extend core
+   classes <./general/core_classes>`, in addition to being able to
+   replace them.
+-  Added support for storing :doc:`models within
+   sub-folders <./general/models>`.
+-  Added :doc:`Download Helper <./helpers/download_helper>`.
+-  Added :doc:`simple_query() <./database/queries>` function to the
+   database classes
+-  Added :doc:`standard_date() <./helpers/date_helper>` function to
+   the Date Helper.
+-  Added :doc:`$query->free_result() <./database/results>` to database
+   class.
+-  Added :doc:`$query->list_fields() <./database/fields>` function to
+   database class
+-  Added :doc:`$this->db->platform() <./database/helpers>` function
+-  Added new :doc:`File Helper <./helpers/file_helper>`:
+   get_filenames()
+-  Added new helper: :doc:`Smiley Helper <./helpers/smiley_helper>`
+-  Added support for 
     and 
       lists in the :doc:`HTML
+   Helper <./helpers/html_helper>`
+-  Added the ability to rewrite :doc:`short
+   tags <./general/alternative_php>` on-the-fly, converting them
+   to standard PHP statements, for those servers that do not support
+   short tags. This allows the cleaner syntax to be used regardless of
+   whether it's supported by the server.
+-  Added the ability to :doc:`rename or relocate the "application"
+   folder <./general/managing_apps>`.
+-  Added more thorough initialization in the upload class so that all
+   class variables are reset.
+-  Added "is_numeric" to validation, which uses the native PHP
+   is_numeric function.
+-  Improved the URI handler to make it more reliable when the
+   $config['uri_protocol'] item is set to AUTO.
+-  Moved most of the functions in the Controller class into the Loader
+   class, allowing fewer reserved function names for controllers when
+   running under PHP 5.
+-  Updated the DB Result class to return an empty array when
+   $query->result() doesn't produce a result.
+-  Updated the input->cookie() and input->post() functions in :doc:`Input
+   Class <./libraries/input>` to permit arrays contained cookies
+   that are arrays to be run through the XSS filter.
+-  Documented three functions from the Validation
+   class that were missing from the user
+   guide: set_select(), set_radio(), and set_checkbox().
+-  Fixed a bug in the Email class related to SMTP Helo data.
+-  Fixed a bug in the word wrapping helper and function in the email
+   class.
+-  Fixed a bug in the validation class.
+-  Fixed a bug in the typography helper that was incorrectly wrapping
+   block level elements in paragraph tags.
+-  Fixed a problem in the form_prep() function that was double encoding
+   entities.
+-  Fixed a bug that affects some versions of PHP when output buffering
+   is nested.
+-  Fixed a bug that caused CI to stop working when the PHP magic
+   __get() or __set() functions were used within models or
+   controllers.
+-  Fixed a pagination bug that was permitting negative values in the
+   URL.
+-  Fixed an oversight in which the Loader class was not allowed to be
+   extended.
+-  Changed _get_config() to get_config() since the function is not a
+   private one.
+-  **Deprecated "init" folder**. Initialization happens automatically
+   now. :doc:`Please see documentation <./general/creating_libraries>`.
+-  **Deprecated** $this->db->field_names() USE
+   $this->db->list_fields()
+-  **Deprecated** the $config['log_errors'] item from the config.php
+   file. Instead, $config['log_threshold'] can be set to "0" to turn it
+   off.
+
+Version 1.4.1
+=============
+
+Release Date: September 21, 2006
+
+-  Added a new feature that passes URI segments directly to your
+   function calls as parameters. See the
+   :doc:`Controllers ` page for more info.
+-  Added support for a function named _output(), which when used in
+   your controllers will received the final rendered output from the
+   output class. More info in the :doc:`Controllers `
+   page.
+-  Added several new functions in the :doc:`URI
+   Class <./libraries/uri>` to let you retrieve and manipulate URI
+   segments that have been re-routed using the :doc:`URI
+   Routing ` feature. Previously, the URI class did not
+   permit you to access any re-routed URI segments, but now it does.
+-  Added :doc:`$this->output->set_header() <./libraries/output>`
+   function, which allows you to set server headers.
+-  Updated plugins, helpers, and language classes to allow your
+   application folder to contain its own plugins, helpers, and language
+   folders. Previously they were always treated as global for your
+   entire installation. If your application folder contains any of these
+   resources they will be used *instead* the global ones.
+-  Added :doc:`Inflector helper <./helpers/inflector_helper>`.
+-  Added element() function in the :doc:`array
+   helper <./helpers/array_helper>`.
+-  Added RAND() to active record orderby() function.
+-  Added delete_cookie() and get_cookie() to :doc:`Cookie
+   helper <./helpers/cookie_helper>`, even though the input class
+   has a cookie fetching function.
+-  Added Oracle database driver (still undergoing testing so it might
+   have some bugs).
+-  Added the ability to combine pseudo-variables and php variables in
+   the template parser class.
+-  Added output compression option to the config file.
+-  Removed the is_numeric test from the db->escape() function.
+-  Fixed a MySQLi bug that was causing error messages not to contain
+   proper error data.
+-  Fixed a bug in the email class which was causing it to ignore
+   explicitly set alternative headers.
+-  Fixed a bug that was causing a PHP error when the Exceptions class
+   was called within the get_config() function since it was causing
+   problems.
+-  Fixed an oversight in the cookie helper in which the config file
+   cookie settings were not being honored.
+-  Fixed an oversight in the upload class. An item mentioned in the 1.4
+   changelog was missing.
+-  Added some code to allow email attachments to be reset when sending
+   batches of email.
+-  Deprecated the application/scripts folder. It will continue to work
+   for legacy users, but it is recommended that you create your own
+   :doc:`libraries <./general/libraries>` or
+   :doc:`models <./general/models>` instead. It was originally added
+   before CI had user libraries or models, but it's not needed anymore.
+-  Deprecated the $autoload['core'] item from the autoload.php file.
+   Instead, please now use: $autoload['libraries']
+-  Deprecated the following database functions:
+   $this->db->smart_escape_str() and $this->db->fields().
+
+Version 1.4.0
+=============
+
+Release Date: September 17, 2006
+
+-  Added :doc:`Hooks <./general/hooks>` feature, enabling you to tap
+   into and modify the inner workings of the framework without hacking
+   the core files.
+-  Added the ability to organize controller files :doc:`into
+   sub-folders `. Kudos to Marco for
+   `suggesting `_ this
+   (and the next two) feature.
+-  Added regular expressions support for `routing
+   rules <./general/routing>`.
+-  Added the ability to :doc:`remap function
+   calls <./general/controllers>` within your controllers.
+-  Added the ability to :doc:`replace core system
+   classes <./general/core_classes>` with your own classes.
+-  Added support for % character in URL.
+-  Added the ability to supply full URLs using the
+   :doc:`anchor() <./helpers/url_helper>` helper function.
+-  Added mode parameter to :doc:`file_write() <./helpers/file_helper>`
+   helper.
+-  Added support for changing the port number in the :doc:`Postgres
+   driver <./database/configuration>`.
+-  Moved the list of "allowed URI characters" out of the Router class
+   and into the config file.
+-  Moved the MIME type array out of the Upload class and into its own
+   file in the applications/config/ folder.
+-  Updated the Upload class to allow the upload field name to be set
+   when calling :doc:`do_upload() <./libraries/file_uploading>`.
+-  Updated the :doc:`Config Library <./libraries/config>` to be able to
+   load config files silently, and to be able to assign config files to
+   their own index (to avoid collisions if you use multiple config
+   files).
+-  Updated the URI Protocol code to allow more options so that URLs will
+   work more reliably in different environments.
+-  Updated the form_open() helper to allow the GET method to be used.
+-  Updated the MySQLi execute() function with some code to help prevent
+   lost connection errors.
+-  Updated the SQLite Driver to check for object support before
+   attempting to return results as objects. If unsupported it returns an
+   array.
+-  Updated the Models loader function to allow multiple loads of the
+   same model.
+-  Updated the MS SQL driver so that single quotes are escaped.
+-  Updated the Postgres and ODBC drivers for better compatibility.
+-  Removed a strtolower() call that was changing URL segments to lower
+   case.
+-  Removed some references that were interfering with PHP 4.4.1
+   compatibility.
+-  Removed backticks from Postgres class since these are not needed.
+-  Renamed display() to _display() in the Output class to make it clear
+   that it's a private function.
+-  Deprecated the hash() function due to a naming conflict with a native
+   PHP function with the same name. Please use dohash() instead.
+-  Fixed an bug that was preventing the input class from unsetting GET
+   variables.
+-  Fixed a router bug that was making it too greedy when matching end
+   segments.
+-  Fixed a bug that was preventing multiple discrete database calls.
+-  Fixed a bug in which loading a language file was producing a "file
+   contains no data" message.
+-  Fixed a session bug caused by the XSS Filtering feature inadvertently
+   changing the case of certain words.
+-  Fixed some missing prefixes when using the database prefix feature.
+-  Fixed a typo in the Calendar class (cal_november).
+-  Fixed a bug in the form_checkbox() helper.
+-  Fixed a bug that was allowing the second segment of the URI to be
+   identical to the class name.
+-  Fixed an evaluation bug in the database initialization function.
+-  Fixed a minor bug in one of the error messages in the language class.
+-  Fixed a bug in the date helper timespan function.
+-  Fixed an undefined variable in the DB Driver class.
+-  Fixed a bug in which dollar signs used as binding replacement values
+   in the DB class would be treated as RegEx back-references.
+-  Fixed a bug in the set_hash() function which was preventing MD5 from
+   being used.
+-  Fixed a couple bugs in the Unit Testing class.
+-  Fixed an incorrectly named variable in the Validation class.
+-  Fixed an incorrectly named variable in the URI class.
+-  Fixed a bug in the config class that was preventing the base URL from
+   being called properly.
+-  Fixed a bug in the validation class that was not permitting callbacks
+   if the form field was empty.
+-  Fixed a problem that was preventing scaffolding from working properly
+   with MySQLi.
+-  Fixed some MS SQL bugs.
+-  Fixed some doc typos.
+
+Version 1.3.3
+=============
+
+Release Date: June 1, 2006
+
+-  Models do **not** connect automatically to the database as of this
+   version. :doc:`More info here <./general/models>`.
+-  Updated the Sessions class to utilize the active record class when
+   running session related queries. Previously the queries assumed MySQL
+   syntax.
+-  Updated alternator() function to re-initialize when called with no
+   arguments, allowing multiple calls.
+-  Fixed a bug in the active record "having" function.
+-  Fixed a problem in the validation class which was making checkboxes
+   be ignored when required.
+-  Fixed a bug in the word_limiter() helper function. It was cutting
+   off the fist word.
+-  Fixed a bug in the xss_clean function due to a PHP bug that affects
+   some versions of html_entity_decode.
+-  Fixed a validation bug that was preventing rules from being set twice
+   in one controller.
+-  Fixed a calendar bug that was not letting it use dynamically loaded
+   languages.
+-  Fixed a bug in the active record class when using WHERE clauses with
+   LIKE
+-  Fixed a bug in the hash() security helper.
+-  Fixed some typos.
+
+Version 1.3.2
+=============
+
+Release Date: April 17, 2006
+
+-  Changed the behavior of the validation class such that if a
+   "required" rule is NOT explicitly stated for a field then all other
+   tests get ignored.
+-  Fixed a bug in the Controller class that was causing it to look in
+   the local "init" folder instead of the main system one.
+-  Fixed a bug in the init_pagination file. The $config item was not
+   being set correctly.
+-  Fixed a bug in the auto typography helper that was causing
+   inconsistent behavior.
+-  Fixed a couple bugs in the Model class.
+-  Fixed some documentation typos and errata.
+
+Version 1.3.1
+=============
+
+Release Date: April 11, 2006
+
+-  Added a :doc:`Unit Testing Library <./libraries/unit_testing>`.
+-  Added the ability to pass objects to the **insert()** and
+   **update()** database functions. This feature enables you to (among
+   other things) use your :doc:`Model class <./general/models>`
+   variables to run queries with. See the Models page for details.
+-  Added the ability to pass objects to the :doc:`view loading
+   function <./general/views>`: $this->load->view('my_view',
+   $object);
+-  Added getwhere function to :doc:`Active Record
+   class <./database/active_record>`.
+-  Added count_all function to :doc:`Active Record
+   class <./database/active_record>`.
+-  Added language file for scaffolding and fixed a scaffolding bug that
+   occurs when there are no rows in the specified table.
+-  Added :doc:`$this->db->last_query() <./database/queries>`, which
+   allows you to view your last query that was run.
+-  Added a new mime type to the upload class for better compatibility.
+-  Changed how cache files are read to prevent PHP errors if the cache
+   file contains an XML tag, which PHP wants to interpret as a short
+   tag.
+-  Fixed a bug in a couple of the active record functions (where and
+   orderby).
+-  Fixed a bug in the image library when realpath() returns false.
+-  Fixed a bug in the Models that was preventing libraries from being
+   used within them.
+-  Fixed a bug in the "exact_length" function of the validation class.
+-  Fixed some typos in the user guide
+
+Version 1.3
+===========
+
+Release Date: April 3, 2006
+
+-  Added support for :doc:`Models `.
+-  Redesigned the database libraries to support additional RDBMs
+   (Postgres, MySQLi, etc.).
+-  Redesigned the :doc:`Active Record class <./database/active_record>`
+   to enable more varied types of queries with simpler syntax, and
+   advanced features like JOINs.
+-  Added a feature to the database class that lets you run :doc:`custom
+   function calls <./database/call_function>`.
+-  Added support for :doc:`private functions ` in your
+   controllers. Any controller function name that starts with an
+   underscore will not be served by a URI request.
+-  Added the ability to pass your own initialization parameters to your
+   :doc:`custom core libraries ` when using
+   $this->load->library()
+-  Added support for running standard :doc:`query string URLs `.
+   These can be optionally enabled in your config file.
+-  Added the ability to :doc:`specify a "suffix" `, which will be
+   appended to your URLs. For example, you could add .html to your URLs,
+   making them appear static. This feature is enabled in your config
+   file.
+-  Added a new error template for use with native PHP errors.
+-  Added "alternator" function in the :doc:`string
+   helpers <./helpers/string_helper>`.
+-  Removed slashing from the input class. After much debate we decided
+   to kill this feature.
+-  Change the commenting style in the scripts to the PEAR standard so
+   that IDEs and tools like phpDocumenter can harvest the comments.
+-  Added better class and function name-spacing to avoid collisions with
+   user developed classes. All CodeIgniter classes are now prefixed with
+   CI\_ and all controller methods are prefixed with _ci to avoid
+   controller collisions. A list of reserved function names can be
+   :doc:`found here `.
+-  Redesigned how the "CI" super object is referenced, depending on
+   whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful
+   way to manage objects that utilizes a bit less resources.
+-  Deprecated: $this->db->use_table() has been deprecated. Please read
+   the :doc:`Active Record <./database/active_record>` page for
+   information.
+-  Deprecated: $this->db->smart_escape_str() has been deprecated.
+   Please use this instead: $this->db->escape()
+-  Fixed a bug in the exception handler which was preventing some PHP
+   errors from showing up.
+-  Fixed a typo in the URI class. $this->total_segment() should be
+   plural: $this->total_segments()
+-  Fixed some typos in the default calendar template
+-  Fixed some typos in the user guide
+
+Version 1.2
+===========
+
+Release Date: March 21, 2006
+
+-  Redesigned some internal aspects of the framework to resolve scoping
+   problems that surfaced during the beta tests. The problem was most
+   notable when instantiating classes in your constructors, particularly
+   if those classes in turn did work in their constructors.
+-  Added a global function named
+   :doc:`get_instance() ` allowing the main
+   CodeIgniter object to be accessible throughout your own classes.
+-  Added new :doc:`File Helper <./helpers/file_helper>`:
+   delete_files()
+-  Added new :doc:`URL Helpers <./helpers/url_helper>`: base_url(),
+   index_page()
+-  Added the ability to create your own :doc:`core
+   libraries ` and store them in your local
+   application directory.
+-  Added an overwrite option to the :doc:`Upload
+   class <./libraries/file_uploading>`, enabling files to be
+   overwritten rather than having the file name appended.
+-  Added Javascript Calendar plugin.
+-  Added search feature to user guide. Note: This is done using Google,
+   which at the time of this writing has not crawled all the pages of
+   the docs.
+-  Updated the parser class so that it allows tag pars within other tag
+   pairs.
+-  Fixed a bug in the DB "where" function.
+-  Fixed a bug that was preventing custom config files to be
+   auto-loaded.
+-  Fixed a bug in the mysql class bind feature that prevented question
+   marks in the replacement data.
+-  Fixed some bugs in the xss_clean function
+
+Version Beta 1.1
+================
+
+Release Date: March 10, 2006
+
+-  Added a :doc:`Calendaring class <./libraries/calendar>`.
+-  Added support for running :doc:`multiple
+   applications ` that share a common CodeIgniter
+   backend.
+-  Moved the "uri protocol" variable from the index.php file into the
+   config.php file
+-  Fixed a problem that was preventing certain function calls from
+   working within constructors.
+-  Fixed a problem that was preventing the $this->load->library function
+   from working in constructors.
+-  Fixed a bug that occurred when the session class was loaded using the
+   auto-load routine.
+-  Fixed a bug that can happen with PHP versions that do not support the
+   E_STRICT constant
+-  Fixed a data type error in the form_radio function (form helper)
+-  Fixed a bug that was preventing the xss_clean function from being
+   called from the validation class.
+-  Fixed the cookie related config names, which were incorrectly
+   specified as $conf rather than $config
+-  Fixed a pagination problem in the scaffolding.
+-  Fixed a bug in the mysql class "where" function.
+-  Fixed a regex problem in some code that trimmed duplicate slashes.
+-  Fixed a bug in the br() function in the HTML helper
+-  Fixed a syntax mistake in the form_dropdown function in the Form
+   Helper.
+-  Removed the "style" attributes form the form helpers.
+-  Updated the documentation. Added "next/previous" links to each page
+   and fixed various typos.
+
+Version Beta 1.0
+================
+
+Release Date: February 28, 2006
+
+First publicly released version.
-- 
cgit v1.2.3-24-g4f1b


From d75e03a4529fb5b12ec280e2f2ae8c7989d83e8d Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu 
Date: Fri, 7 Oct 2011 14:44:35 +0800
Subject: Update: add changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f3e7cbbdd..925785d13 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -107,6 +107,7 @@ Bug fixes for 2.1.0
 -  Fixed a bug (#467) - Suppress warnings generated from get_magic_quotes_gpc() (deprecated in PHP 5.4)
 -  Fixed a bug (#484) - First time _csrf_set_hash() is called, hash is never set to the cookie (in Security.php).
 -  Fixed a bug (#60) - Added _file_mime_type() method to the `File Uploading Library ` in order to fix a possible MIME-type injection.
+-  Fixed a bug (#537) - Support for all wav type in browser.
 
 Version 2.0.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From 01b56bcb4e1188c37c5e9474d1427252b953f37f Mon Sep 17 00:00:00 2001
From: Timothy Warren 
Date: Mon, 10 Oct 2011 10:45:45 -0400
Subject: Fixed some formatting issues with the changelog

---
 user_guide_src/source/changelog.rst | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 925785d13..d071f1c0d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -30,22 +30,23 @@ Release Date: Not Released
    -  Altered form helper - made action on form_open_multipart helper
       function call optional. Fixes (#65)
    -  url_title() will now trim extra dashes from beginning and end.
-   -  Improved speed of String Helper's random_string() method
-   -  Added XHTML Basic 1.1 doctype to HTML Helper.
+   -  Improved speed of :doc:`String
+      Helper `'s random_string() method
+   -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
 
 -  Database
 
-   -  Added a `CUBRID `_ driver to the `Database
+   -  Added a `CUBRID `_ driver to the :doc:`Database
       Driver `. Thanks to the CUBRID team for
       supplying this patch.
-   -  Added a PDO driver to the Database Driver.
+   -  Added a PDO driver to the :doc:`Database Driver `.
    -  Typecast limit and offset in the :doc:`Database
       Driver ` to integers to avoid possible
       injection.
    -  Added additional option 'none' for the optional third argument for
       $this->db->like() in the :doc:`Database
       Driver `.
-   -  Added $this->db->insert_batch() support to the OCI8 (Oracle) driver.
+   -  Added $this->db->insert_batch() support to the OCI8 (Oracle) driver.
 
 -  Libraries
 
@@ -61,7 +62,7 @@ Release Date: Not Released
    -  Added is_unique to the :doc:`Form Validation
       library `.
    -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the Form Validation library.
-   -  Added $config['use_page_numbers'] to the Pagination library, which enables real page numbers in the URI.
+   -  Added $config['use_page_numbers'] to the :doc:`Pagination library `, which enables real page numbers in the URI.
    -  Added TLS and SSL Encryption for SMTP.
 
 -  Core
@@ -145,7 +146,7 @@ Release Date: August 20, 2011
       Thanks to epallerols for the patch.
    -  Added "application/x-csv" to mimes.php.
    -  Added CSRF protection URI whitelisting.
-   -  Fixed a bug where `Email library `
+   -  Fixed a bug where :doc:`Email library `
       attachments with a "." in the name would using invalid MIME-types.
    -  Added support for
       pem,p10,p12,p7a,p7c,p7m,p7r,p7s,crt,crl,der,kdb,rsa,cer,sst,csr
-- 
cgit v1.2.3-24-g4f1b


From 74479279a506c45d6fcd16e3f08469eb46cd1bed Mon Sep 17 00:00:00 2001
From: Timothy Warren 
Date: Mon, 10 Oct 2011 10:51:55 -0400
Subject: Fixed an extraneous new line

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d071f1c0d..a6a2683aa 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -30,8 +30,7 @@ Release Date: Not Released
    -  Altered form helper - made action on form_open_multipart helper
       function call optional. Fixes (#65)
    -  url_title() will now trim extra dashes from beginning and end.
-   -  Improved speed of :doc:`String
-      Helper `'s random_string() method
+   -  Improved speed of :doc:`String Helper `'s random_string() method
    -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
 
 -  Database
-- 
cgit v1.2.3-24-g4f1b


From cd38d6774bf11bab8e2a07f861c876097a287f59 Mon Sep 17 00:00:00 2001
From: Kyle Farris 
Date: Fri, 14 Oct 2011 12:49:40 -0400
Subject: Merged with develop and updated to new changelog.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a6a2683aa..ba6aaaac8 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -46,6 +46,8 @@ Release Date: Not Released
       $this->db->like() in the :doc:`Database
       Driver `.
    -  Added $this->db->insert_batch() support to the OCI8 (Oracle) driver.
+   -  Fixed a bug (#200) where MySQL queries would be malformed after calling 
+      `count_all()` then `db->get()`.
 
 -  Libraries
 
@@ -108,6 +110,8 @@ Bug fixes for 2.1.0
 -  Fixed a bug (#484) - First time _csrf_set_hash() is called, hash is never set to the cookie (in Security.php).
 -  Fixed a bug (#60) - Added _file_mime_type() method to the `File Uploading Library ` in order to fix a possible MIME-type injection.
 -  Fixed a bug (#537) - Support for all wav type in browser.
+-  Fixed a bug (#200) - MySQL queries would be malformed after calling
+   count_all() then db->get().
 
 Version 2.0.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From d08aa31a8b578a2e6687be4c9fe864fe08bd66d6 Mon Sep 17 00:00:00 2001
From: Kyle Farris 
Date: Fri, 14 Oct 2011 13:56:54 -0300
Subject: Ooops, removed duplicate entry in changelog.

---
 user_guide_src/source/changelog.rst | 2 --
 1 file changed, 2 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ba6aaaac8..b844fdcc6 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -46,8 +46,6 @@ Release Date: Not Released
       $this->db->like() in the :doc:`Database
       Driver `.
    -  Added $this->db->insert_batch() support to the OCI8 (Oracle) driver.
-   -  Fixed a bug (#200) where MySQL queries would be malformed after calling 
-      `count_all()` then `db->get()`.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 6f1fa5e6e40ae35bb8eeec359cb9f830b832c572 Mon Sep 17 00:00:00 2001
From: Kyle Farris 
Date: Fri, 14 Oct 2011 15:13:39 -0300
Subject: Fixed new line typo.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b844fdcc6..7b89f1782 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -108,8 +108,7 @@ Bug fixes for 2.1.0
 -  Fixed a bug (#484) - First time _csrf_set_hash() is called, hash is never set to the cookie (in Security.php).
 -  Fixed a bug (#60) - Added _file_mime_type() method to the `File Uploading Library ` in order to fix a possible MIME-type injection.
 -  Fixed a bug (#537) - Support for all wav type in browser.
--  Fixed a bug (#200) - MySQL queries would be malformed after calling
-   count_all() then db->get().
+-  Fixed a bug (#200) - MySQL queries would be malformed after calling count_all() then db->get().
 
 Version 2.0.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From 053dbc851f4c209ae05e1f079bb6da22e629b507 Mon Sep 17 00:00:00 2001
From: Kyle Farris 
Date: Fri, 14 Oct 2011 18:06:52 -0300
Subject: Updated changelog to new changelog format.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a6a2683aa..d0b935224 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -46,6 +46,9 @@ Release Date: Not Released
       $this->db->like() in the :doc:`Database
       Driver `.
    -  Added $this->db->insert_batch() support to the OCI8 (Oracle) driver.
+   -  Added new :doc:`Active Record ` methods that return 
+      the SQL string of queries without executing them: get_compiled_select(), 
+      get_compiled_insert(), get_compiled_update(), get_compiled_delete().
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 4d7c27eec7995c94f60ba421e209eb5a2da08711 Mon Sep 17 00:00:00 2001
From: Bo-Yi Wu 
Date: Sat, 15 Oct 2011 12:02:32 +0800
Subject: Fix #576: using ini_get() to detect if apc is enabled or not

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 925785d13..a5044e07b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -108,6 +108,7 @@ Bug fixes for 2.1.0
 -  Fixed a bug (#484) - First time _csrf_set_hash() is called, hash is never set to the cookie (in Security.php).
 -  Fixed a bug (#60) - Added _file_mime_type() method to the `File Uploading Library ` in order to fix a possible MIME-type injection.
 -  Fixed a bug (#537) - Support for all wav type in browser.
+-  Fixed a bug (#576) - Using ini_get() function to detect if apc is enabled or not.
 
 Version 2.0.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From 2d096c0339f1cef810cc74e93f4d0633ee8e215f Mon Sep 17 00:00:00 2001
From: Timothy Warren 
Date: Mon, 17 Oct 2011 12:24:56 -0400
Subject: Added changelog item

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3e1643524..0b12d758c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -8,7 +8,7 @@ Version 2.1.0 (planned)
 Release Date: Not Released
 
 -  General Changes
-
+   -  Added an optional backtrace to php-error template
    -  Added Android to the list of user agents.
    -  Added Windows 7 to the list of user platforms.
    -  Callback validation rules can now accept parameters like any other
-- 
cgit v1.2.3-24-g4f1b


From deb65968c2be11b72f1072d5fd840edd1da031dd Mon Sep 17 00:00:00 2001
From: Timothy Warren 
Date: Mon, 17 Oct 2011 12:26:02 -0400
Subject: Added changelog item

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 0b12d758c..e4c318f43 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -8,7 +8,8 @@ Version 2.1.0 (planned)
 Release Date: Not Released
 
 -  General Changes
-   -  Added an optional backtrace to php-error template
+
+   -  Added an optional backtrace to php-error template,
    -  Added Android to the list of user agents.
    -  Added Windows 7 to the list of user platforms.
    -  Callback validation rules can now accept parameters like any other
-- 
cgit v1.2.3-24-g4f1b


From 52aff71bac8bf93eff797e35d875334ebd3585a0 Mon Sep 17 00:00:00 2001
From: Timothy Warren 
Date: Mon, 17 Oct 2011 12:26:56 -0400
Subject: Added changelog item

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index e4c318f43..97e949542 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -9,7 +9,7 @@ Release Date: Not Released
 
 -  General Changes
 
-   -  Added an optional backtrace to php-error template,
+   -  Added an optional backtrace to php-error template.
    -  Added Android to the list of user agents.
    -  Added Windows 7 to the list of user platforms.
    -  Callback validation rules can now accept parameters like any other
-- 
cgit v1.2.3-24-g4f1b


From caa1db64141cc8bfbdbe3a4f6f7b639331d5d3ba Mon Sep 17 00:00:00 2001
From: Derek Jones 
Date: Mon, 17 Oct 2011 21:17:21 -0500
Subject: added some additional notes to the 2.0.0 update notes to highlight
 some of the potential gotchas, fixes #588

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 906e2ebaa..bbf2ec778 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -323,6 +323,8 @@ Bug fixes for 2.0.1
 -  Fixed a bug (Reactor #69) where the SHA1 library was named
    incorrectly.
 
+.. _2.0.0-changelog:
+
 Version 2.0.0
 =============
 
-- 
cgit v1.2.3-24-g4f1b


From 68647366bce35e180e086902bd6ec9557422ac94 Mon Sep 17 00:00:00 2001
From: kenjis 
Date: Tue, 18 Oct 2011 23:33:23 +0900
Subject: fix changelog difference between HTML and RST

---
 user_guide_src/source/changelog.rst | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index bbf2ec778..8598585ce 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -58,6 +58,8 @@ Release Date: Not Released
    -  Added support to set an optional parameter in your callback rules
       of validation using the :doc:`Form Validation
       Library `.
+   -  Added a :doc:`Migration Library ` to assist with applying
+      incremental updates to your database schema.
    -  Driver children can be located in any package path.
    -  Added max_filename_increment config setting for Upload library.
    -  CI_Loader::_ci_autoloader() is now a protected method.
@@ -151,14 +153,6 @@ Release Date: August 20, 2011
    -  Added CSRF protection URI whitelisting.
    -  Fixed a bug where :doc:`Email library `
       attachments with a "." in the name would using invalid MIME-types.
-   -  Added support for
-      pem,p10,p12,p7a,p7c,p7m,p7r,p7s,crt,crl,der,kdb,rsa,cer,sst,csr
-      Certs to mimes.php.
-   -  Added support pgp,gpg to mimes.php.
-   -  Added support 3gp, 3g2, mp4, wmv, f4v, vlc Video files to
-      mimes.php.
-   -  Added support m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files
-      to mimes.php.
 
 -  Helpers
 
-- 
cgit v1.2.3-24-g4f1b


From 087a7a805a36d098e577c25b9505d755bb8b4acd Mon Sep 17 00:00:00 2001
From: kenjis 
Date: Thu, 20 Oct 2011 20:08:47 +0900
Subject: fix RST format and typo

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8249b63ad..66eff1ba5 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -66,7 +66,7 @@ Release Date: Not Released
    -  CI_Loader::_ci_autoloader() is now a protected method.
    -  Added is_unique to the :doc:`Form Validation
       library `.
-   -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the Form Validation library.
+   -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Form Validation library `.
    -  Added $config['use_page_numbers'] to the :doc:`Pagination library `, which enables real page numbers in the URI.
    -  Added TLS and SSL Encryption for SMTP.
 
@@ -105,14 +105,14 @@ Bug fixes for 2.1.0
    __construct().
 -  Fixed a bug (#85) - OCI8 (Oracle) database escape_str() function did
    not escape correct.
--  Fixed a bug (#344) - Using schema found in Saving Session Data to a Database, system would throw error "user_data does not have a default value" when deleting then creating a session.
+-  Fixed a bug (#344) - Using schema found in :doc:`Saving Session Data to a Database `, system would throw error "user_data does not have a default value" when deleting then creating a session.
 -  Fixed a bug (#112) - OCI8 (Oracle) driver didn't pass the configured database character set when connecting.
 -  Fixed a bug (#182) - OCI8 (Oracle) driver used to re-execute the statement whenever num_rows() is called.
--  Fixed a bug (#82) - WHERE clause field names in the DB update_string() method were not escaped, resulting in failed queries in some cases.
--  Fixed a bug (#89) - Fix a variable type mismatch in DB display_error() where an array is expected, but a string could be set instead.
+-  Fixed a bug (#82) - WHERE clause field names in the DB update_string() method were not escaped, resulting in failed queries in some cases.
+-  Fixed a bug (#89) - Fix a variable type mismatch in DB display_error() where an array is expected, but a string could be set instead.
 -  Fixed a bug (#467) - Suppress warnings generated from get_magic_quotes_gpc() (deprecated in PHP 5.4)
 -  Fixed a bug (#484) - First time _csrf_set_hash() is called, hash is never set to the cookie (in Security.php).
--  Fixed a bug (#60) - Added _file_mime_type() method to the `File Uploading Library ` in order to fix a possible MIME-type injection.
+-  Fixed a bug (#60) - Added _file_mime_type() method to the :doc:`File Uploading Library ` in order to fix a possible MIME-type injection.
 -  Fixed a bug (#537) - Support for all wav type in browser.
 -  Fixed a bug (#576) - Using ini_get() function to detect if apc is enabled or not.
 
@@ -280,7 +280,7 @@ Hg Tag: v2.0.1
       TRUE and Reactor: FALSE.
    -  Added an ENVIRONMENT constant in index.php, which affects PHP
       error reporting settings, and optionally, which configuration
-      files are loaded (see below). Read more on the `Handling
+      files are loaded (see below). Read more on the :doc:`Handling
       Environments ` page.
    -  Added support for
       :ref:`environment-specific `
@@ -288,7 +288,7 @@ Hg Tag: v2.0.1
 
 -  Libraries
 
-   -  Added decimal, less_than and greater_than rules to the `Form
+   -  Added decimal, less_than and greater_than rules to the :doc:`Form
       validation Class `.
    -  :doc:`Input Class ` methods post() and get()
       will now return a full array if the first argument is not
@@ -362,7 +362,7 @@ Hg Tag: v2.0.0
    -  Removed the deprecated Validation Class.
    -  Added CI\_ Prefix to all core classes.
    -  Package paths can now be set in application/config/autoload.php.
-   -  `Upload library ` file_name can
+   -  :doc:`Upload library ` file_name can
       now be set without an extension, the extension will be taken from
       the uploaded file instead of the given name.
    -  In :doc:`Database Forge ` the name can be omitted
@@ -534,7 +534,7 @@ Hg Tag: v2.0.0
    -  Added "default" to the list :doc:`Reserved
       Names `.
    -  Added 'application/x-msdownload' for .exe files and
-      ''application/x-gzip-compressed' for .tgz files to
+      'application/x-gzip-compressed' for .tgz files to
       config/mimes.php.
    -  Updated the output library to no longer compress output or send
       content-length headers if the server runs with
@@ -665,7 +665,7 @@ Hg Tag: v1.7.2
 
 -  General
 
-   -  Compatible with PHP 5.3.0
+   -  Compatible with PHP 5.3.0.
    -  Modified :doc:`show_error() ` to allow sending
       of HTTP server response codes.
    -  Modified :doc:`show_404() ` to send 404 status
@@ -1273,7 +1273,7 @@ Hg Tag: 1.6.1
       URL encoded strings.
    -  Added $_SERVER, $_FILES, $_ENV, and $_SESSION to sanitization
       of globals.
-   -  Added a `Path Helper <./helpers/path_helper>`.
+   -  Added a :doc:`Path Helper <./helpers/path_helper>`.
    -  Simplified _reindex_segments() in the URI class.
    -  Escaped the '-' in the default 'permitted_uri_chars' config
       item, to prevent errors if developers just try to add additional
@@ -1680,7 +1680,7 @@ Version 1.5.2
 Release Date: February 13, 2007
 
 -  Added subversion information
-   to the `downloads ` page.
+   to the :doc:`downloads ` page.
 -  Added support for captions in the :doc:`Table
    Library <./libraries/table>`
 -  Fixed a bug in the
@@ -1736,7 +1736,7 @@ Version 1.5.0
 
 Release Date: October 30, 2006
 
--  Added `DB utility class <./database/utilities>`, permitting DB
+-  Added :doc:`DB utility class <./database/utilities>`, permitting DB
    backups, CVS or XML files from DB results, and various other
    functions.
 -  Added :doc:`Database Caching Class <./database/caching>`.
@@ -1895,7 +1895,7 @@ Release Date: September 17, 2006
    sub-folders `. Kudos to Marco for
    `suggesting `_ this
    (and the next two) feature.
--  Added regular expressions support for `routing
+-  Added regular expressions support for :doc:`routing
    rules <./general/routing>`.
 -  Added the ability to :doc:`remap function
    calls <./general/controllers>` within your controllers.
-- 
cgit v1.2.3-24-g4f1b


From f4a4bd8fac188ebc9cda822ffc811c218fd92b45 Mon Sep 17 00:00:00 2001
From: Derek Jones 
Date: Thu, 20 Oct 2011 12:18:42 -0500
Subject: adding new license file (OSL 3.0) and updating readme to ReST

added notice of license to all source files.
OSL to all except the few files we ship inside of the application folder, those are AFL.
Updated license in user guide.

incrementing next dev version to 3.0 due to licensing change
---
 user_guide_src/source/changelog.rst | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 66eff1ba5..3a2990b2c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -2,11 +2,21 @@
 Change Log
 ##########
 
-Version 2.1.0 (planned)
+Version 3.0 (planned)
 =======================
 
 Release Date: Not Released
 
+-  License
+
+   -  CodeIgniter has been relicensed with the Open Software License (3.0),
+      eliminating its old proprietary licensing.
+
+      -  All system files are licensed with OSL 3.0.
+      -  Config, error, and sample files shipped in the application folder are
+         licensed with the Academic Free License (3.0) to allow you to retain
+         all licensing authority over your own application code.
+
 -  General Changes
 
    -  Added an optional backtrace to php-error template.
-- 
cgit v1.2.3-24-g4f1b


From f748ebca53568d4832faa15e702e8f0d8123703a Mon Sep 17 00:00:00 2001
From: Phil Sturgeon 
Date: Sun, 13 Nov 2011 19:24:16 +0000
Subject: Changelog tweaking the Sphinx docs to match old HTML docs for 2.1 and
 accurately describe what 3.0 has added so far.

---
 user_guide_src/source/changelog.rst | 74 ++++++++++++++++++++++++++-----------
 1 file changed, 52 insertions(+), 22 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3a2990b2c..a071e5a66 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -22,16 +22,55 @@ Release Date: Not Released
    -  Added an optional backtrace to php-error template.
    -  Added Android to the list of user agents.
    -  Added Windows 7 to the list of user platforms.
+   -  Ability to log certain error types, not all under a threshold.
+   -  Added support for pem, p10, p12, p7a, p7c, p7m, p7r, p7s, crt, crl, der, kdb, rsa, cer, sst, csr Certs to mimes.php.
+   -  Added support pgp and gpg to mimes.php.
+   -  Added support 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
+   -  Added support m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
+
+-  Helpers
+
+   -  url_title() will now trim extra dashes from beginning and end.
+   -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
+
+-  Database
+
+   -  Added new :doc:`Active Record ` methods that return 
+      the SQL string of queries without executing them: get_compiled_select(), 
+      get_compiled_insert(), get_compiled_update(), get_compiled_delete().
+
+-  Libraries
+
+   -  Added max_filename_increment config setting for Upload library.
+   -  CI_Loader::_ci_autoloader() is now a protected method.
+   -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Form Validation library `.
+
+-  Core
+
+   -  Changed private functions in CI_URI to protected so MY_URI can
+      override them.
+   -  Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
+
+Bug fixes for 3.0
+------------------
+
+-  Unlink raised an error if cache file did not exist when you try to delete it.
+-  Fixed a bug (#181) where a mis-spelling was in the form validation
+   language file.
+
+
+Version 2.1.0
+=============
+
+Release Date: Not Released
+
+-  General Changes
+
    -  Callback validation rules can now accept parameters like any other
       validation rule.
-   -  Ability to log certain error types, not all under a threshold.
    -  Added html_escape() to :doc:`Common
       functions ` to escape HTML output
       for preventing XSS.
-   -  Added support for pem,p10,p12,p7a,p7c,p7m,p7r,p7s,crt,crl,der,kdb,rsa,cer,sst,csr Certs to mimes.php.
-   -  Added support pgp,gpg to mimes.php.
-   -  Added support 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
-   -  Added support m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
 
 -  Helpers
 
@@ -42,7 +81,6 @@ Release Date: Not Released
       function call optional. Fixes (#65)
    -  url_title() will now trim extra dashes from beginning and end.
    -  Improved speed of :doc:`String Helper `'s random_string() method
-   -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
 
 -  Database
 
@@ -57,9 +95,6 @@ Release Date: Not Released
       $this->db->like() in the :doc:`Database
       Driver `.
    -  Added $this->db->insert_batch() support to the OCI8 (Oracle) driver.
-   -  Added new :doc:`Active Record ` methods that return 
-      the SQL string of queries without executing them: get_compiled_select(), 
-      get_compiled_insert(), get_compiled_update(), get_compiled_delete().
 
 -  Libraries
 
@@ -69,14 +104,12 @@ Release Date: Not Released
    -  Added support to set an optional parameter in your callback rules
       of validation using the :doc:`Form Validation
       Library `.
-   -  Added a :doc:`Migration Library ` to assist with applying
+   -  Added a :doc:`Migration library ` to assist with applying
       incremental updates to your database schema.
    -  Driver children can be located in any package path.
    -  Added max_filename_increment config setting for Upload library.
-   -  CI_Loader::_ci_autoloader() is now a protected method.
    -  Added is_unique to the :doc:`Form Validation
       library `.
-   -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Form Validation library `.
    -  Added $config['use_page_numbers'] to the :doc:`Pagination library `, which enables real page numbers in the URI.
    -  Added TLS and SSL Encryption for SMTP.
 
@@ -86,10 +119,11 @@ Release Date: Not Released
       override them.
    -  Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
 
+
 Bug fixes for 2.1.0
 -------------------
 
--  Unlink raised an error if cache file did not exist when you try to delete it.
+
 -  Fixed #378 Robots identified as regular browsers by the User Agent
    class.
 -  If a config class was loaded first then a library with the same name
@@ -100,21 +134,16 @@ Bug fixes for 2.1.0
    but the requested method did not.
 -  Fixed a bug (Reactor #89) where MySQL export would fail if the table
    had hyphens or other non alphanumeric/underscore characters.
--  Fixed a bug (#200) where MySQL queries would be malformed after
-   calling count_all() then db->get()
--  Fixed bug #105 that stopped query errors from being logged unless database debugging was enabled
--  Fixed a bug (#181) where a mis-spelling was in the form validation
-   language file.
+-  Fixed a bug (#200) where MySQL queries would be malformed after calling $this->db->count_all() then $this->db->get()
+-  Fixed a bug (#105) that stopped query errors from being logged unless database debugging was enabled
 -  Fixed a bug (#160) - Removed unneeded array copy in the file cache
    driver.
 -  Fixed a bug (#150) - field_data() now correctly returns column
    length.
 -  Fixed a bug (#8) - load_class() now looks for core classes in
    APPPATH first, allowing them to be replaced.
--  Fixed a bug (#24) - ODBC database driver called incorrect parent in
-   __construct().
--  Fixed a bug (#85) - OCI8 (Oracle) database escape_str() function did
-   not escape correct.
+-  Fixed a bug (#24) - ODBC database driver called incorrect parent in __construct().
+-  Fixed a bug (#85) - OCI8 (Oracle) database escape_str() function did not escape correct.
 -  Fixed a bug (#344) - Using schema found in :doc:`Saving Session Data to a Database `, system would throw error "user_data does not have a default value" when deleting then creating a session.
 -  Fixed a bug (#112) - OCI8 (Oracle) driver didn't pass the configured database character set when connecting.
 -  Fixed a bug (#182) - OCI8 (Oracle) driver used to re-execute the statement whenever num_rows() is called.
@@ -125,6 +154,7 @@ Bug fixes for 2.1.0
 -  Fixed a bug (#60) - Added _file_mime_type() method to the :doc:`File Uploading Library ` in order to fix a possible MIME-type injection.
 -  Fixed a bug (#537) - Support for all wav type in browser.
 -  Fixed a bug (#576) - Using ini_get() function to detect if apc is enabled or not.
+
    1. Fixed invalid date time format in Date helper and XMLRPC library.
      2. 
 
 Version 2.0.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From 81dd22393368862760e1cfb30a0d73d070cd38af Mon Sep 17 00:00:00 2001
From: Shane Pearson 
Date: Fri, 18 Nov 2011 20:49:35 -0600
Subject: add method get_vars() to CI_Loader to retrieve all variables loaded
 with $this->load->vars()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a071e5a66..49468e015 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -50,6 +50,7 @@ Release Date: Not Released
    -  Changed private functions in CI_URI to protected so MY_URI can
       override them.
    -  Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
+   -  Added method get_vars() to CI_Loader to retrieve all variables loaded with $this->load->vars()
 
 Bug fixes for 3.0
 ------------------
-- 
cgit v1.2.3-24-g4f1b


From 9001a882424aaf4edc67552d3beecb9283fa1bdd Mon Sep 17 00:00:00 2001
From: has2k1 
Date: Sun, 20 Nov 2011 00:53:32 -0700
Subject: Update user_guide_src/source/changelog.rst

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a071e5a66..1bd0976ba 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -57,6 +57,7 @@ Bug fixes for 3.0
 -  Unlink raised an error if cache file did not exist when you try to delete it.
 -  Fixed a bug (#181) where a mis-spelling was in the form validation
    language file.
+-  Bug #419 - auto_link() now recognizes URLs that come after a word boundary.
 
 
 Version 2.1.0
-- 
cgit v1.2.3-24-g4f1b


From c737c94b6dd2044b7c1a7d506c57de7da6df97f4 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon 
Date: Mon, 21 Nov 2011 11:23:15 +0000
Subject: Updated syntax in changewlog.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a071e5a66..de2b3664b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -154,7 +154,7 @@ Bug fixes for 2.1.0
 -  Fixed a bug (#60) - Added _file_mime_type() method to the :doc:`File Uploading Library ` in order to fix a possible MIME-type injection.
 -  Fixed a bug (#537) - Support for all wav type in browser.
 -  Fixed a bug (#576) - Using ini_get() function to detect if apc is enabled or not.
-
    2. Fixed invalid date time format in Date helper and XMLRPC library.
      3. 
+-  Fixed invalid date time format in :doc:`Date helper ` and :doc:`XMLRPC library `.
 
 Version 2.0.3
 =============
-- 
cgit v1.2.3-24-g4f1b


From 66970cbc04f46072452b60a375c17610ae62b599 Mon Sep 17 00:00:00 2001
From: Jacob Terry 
Date: Tue, 22 Nov 2011 13:12:30 -0500
Subject: Updated changelog with _trans_depth fix.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index de2b3664b..b9ca39cee 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -57,6 +57,7 @@ Bug fixes for 3.0
 -  Unlink raised an error if cache file did not exist when you try to delete it.
 -  Fixed a bug (#181) where a mis-spelling was in the form validation
    language file.
+-  Fixed a bug (#159, #163) that mishandled Active Record nested transactions because _trans_depth was not getting incremented.
 
 
 Version 2.1.0
-- 
cgit v1.2.3-24-g4f1b


From 7f42519fd156a541bdb3517b517287f3352b5e49 Mon Sep 17 00:00:00 2001
From: trit 
Date: Wed, 23 Nov 2011 15:19:49 -0500
Subject: Added a couple of style tweaks and a note about function change in
 changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b9ca39cee..dff4f001d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -44,7 +44,8 @@ Release Date: Not Released
    -  Added max_filename_increment config setting for Upload library.
    -  CI_Loader::_ci_autoloader() is now a protected method.
    -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Form Validation library `.
-
+	 -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname)
+	 
 -  Core
 
    -  Changed private functions in CI_URI to protected so MY_URI can
-- 
cgit v1.2.3-24-g4f1b


From 85fe96df4dd7b7e163fae2d7e0420e750559e65c Mon Sep 17 00:00:00 2001
From: Felix Balfoort 
Date: Tue, 29 Nov 2011 16:27:53 +0100
Subject: Updated change log and and database configuration to include failover

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 979755c06..5c7fd8d59 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -97,6 +97,7 @@ Release Date: Not Released
       $this->db->like() in the :doc:`Database
       Driver `.
    -  Added $this->db->insert_batch() support to the OCI8 (Oracle) driver.
+   -  Added failover if the main connections in the config should fail
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 1d861530da2d598f14c16c68461d83cd5c25bdf6 Mon Sep 17 00:00:00 2001
From: Eric Barnes 
Date: Sun, 4 Dec 2011 10:30:58 -0500
Subject: Updated change log with fixed issues.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5c7fd8d59..a5407ee29 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -59,7 +59,9 @@ Bug fixes for 3.0
 -  Fixed a bug (#181) where a mis-spelling was in the form validation
    language file.
 -  Fixed a bug (#159, #163) that mishandled Active Record nested transactions because _trans_depth was not getting incremented.
+-  Fixed a bug (#737, #75) where pagination anchor class was not set properly when using initialize method.
 -  Bug #419 - auto_link() now recognizes URLs that come after a word boundary.
+-  Bug #724 - is_unique in form validation now checks that you are connected to a database.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From f30da660db8077978e83a09054d0a0c9aebb1e5b Mon Sep 17 00:00:00 2001
From: Eric Barnes 
Date: Sun, 4 Dec 2011 10:35:58 -0500
Subject: Added change log message about logger chmod. Refs: #739

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a5407ee29..5d7cb2643 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -27,6 +27,7 @@ Release Date: Not Released
    -  Added support pgp and gpg to mimes.php.
    -  Added support 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
    -  Added support m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
+   -  Changed logger to only chmod when file is first created.
 
 -  Helpers
 
-- 
cgit v1.2.3-24-g4f1b


From 1866d4fd4ac60295f76f3a8d70f3e4bcaa44b081 Mon Sep 17 00:00:00 2001
From: Thomas Traub 
Date: Mon, 5 Dec 2011 11:58:10 +0100
Subject: The changelog entry for issue #647

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5d7cb2643..2bfae3fd7 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -63,6 +63,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#737, #75) where pagination anchor class was not set properly when using initialize method.
 -  Bug #419 - auto_link() now recognizes URLs that come after a word boundary.
 -  Bug #724 - is_unique in form validation now checks that you are connected to a database.
+-  Bug #647 - _get_mod_time() in Zip library no longer generates stat failed errors
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 5d4da1bae6f00a193db06e940cd59ebf9743b615 Mon Sep 17 00:00:00 2001
From: Eric Barnes 
Date: Mon, 5 Dec 2011 21:55:00 -0500
Subject: Added change log item for bug #608

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2bfae3fd7..c4fbb67b2 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -64,6 +64,7 @@ Bug fixes for 3.0
 -  Bug #419 - auto_link() now recognizes URLs that come after a word boundary.
 -  Bug #724 - is_unique in form validation now checks that you are connected to a database.
 -  Bug #647 - _get_mod_time() in Zip library no longer generates stat failed errors
+-  Bug #608 - Fixes an issue with the Image_lib class not clearing properties completely
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 3cece7b27c965a9a6bc73d080f6df0a6ba681be0 Mon Sep 17 00:00:00 2001
From: Eric Barnes 
Date: Mon, 5 Dec 2011 22:10:12 -0500
Subject: Updated change log

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c4fbb67b2..8dfe2492a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -65,6 +65,7 @@ Bug fixes for 3.0
 -  Bug #724 - is_unique in form validation now checks that you are connected to a database.
 -  Bug #647 - _get_mod_time() in Zip library no longer generates stat failed errors
 -  Bug #608 - Fixes an issue with the Image_lib class not clearing properties completely
+-  Fixed bugs (#157 and #174) - the Image_lib clear() function now resets all variables to their default values.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 17bcd2b5c8b994ca14cc19d31674258b07c905fc Mon Sep 17 00:00:00 2001
From: Tomasz T 
Date: Tue, 6 Dec 2011 12:36:16 +0100
Subject: updated changelog with dbforge fix

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5c7fd8d59..cbe6da28a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -60,6 +60,7 @@ Bug fixes for 3.0
    language file.
 -  Fixed a bug (#159, #163) that mishandled Active Record nested transactions because _trans_depth was not getting incremented.
 -  Bug #419 - auto_link() now recognizes URLs that come after a word boundary.
+-  Fixed a bug where using $this->dbforge->create_table() with PostgreSQL database could lead to fetching whole table.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From cde712ce354dcfd69f9c5e2b56ef7d6f1206d11a Mon Sep 17 00:00:00 2001
From: Eric Barnes 
Date: Fri, 9 Dec 2011 11:27:51 -0500
Subject: Added ability to change the separator value in the humanize function

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 205b087f5..6f41f4519 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -33,6 +33,7 @@ Release Date: Not Released
 
    -  url_title() will now trim extra dashes from beginning and end.
    -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
+   -  Changed humanize to include a second param for the separator.
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From 2e5bda3bde171e71306c80479f04d886127d88a2 Mon Sep 17 00:00:00 2001
From: Andrew Seymour 
Date: Tue, 13 Dec 2011 11:40:15 +0000
Subject: Updated Cart.php to handle quantity changes differently (now
 auto-increments), also updated the changelog to reflect this change for the
 people that are currently using this library

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 6f41f4519..71104418a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -47,6 +47,7 @@ Release Date: Not Released
    -  CI_Loader::_ci_autoloader() is now a protected method.
    -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Form Validation library `.
 	 -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname)
+   -  The Cart library now auto-increments quantity's instead of just resetting it, this is the default behaviour of large e-commerce sites.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 3dd66631330841e4d0e29a95fc279a5d5cc921f2 Mon Sep 17 00:00:00 2001
From: Andrew Seymour 
Date: Tue, 13 Dec 2011 15:50:52 +0000
Subject: Merged the two if's together as suggested by @philsturgeon - updated
 the Changelog to include something that may be important

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 71104418a..eda64e7ff 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -48,6 +48,7 @@ Release Date: Not Released
    -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Form Validation library `.
 	 -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname)
    -  The Cart library now auto-increments quantity's instead of just resetting it, this is the default behaviour of large e-commerce sites.
+   -  Cart Product Name strictness can be disabled via the Cart Library by switching "$product_name_safe"
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From f75ec11d7ed0592f930dd3a090db7c1c6d251eed Mon Sep 17 00:00:00 2001
From: Andrew Seymour 
Date: Wed, 14 Dec 2011 09:36:39 +0000
Subject: Added in a remove item from cart function to save the "hacky" method
 of updating a product with 0 quantity, updated the changelog to reflect and
 to be neater and more readable surrounding the changes of the Cart library

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index eda64e7ff..72b7f7e8a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -47,8 +47,10 @@ Release Date: Not Released
    -  CI_Loader::_ci_autoloader() is now a protected method.
    -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Form Validation library `.
 	 -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname)
-   -  The Cart library now auto-increments quantity's instead of just resetting it, this is the default behaviour of large e-commerce sites.
-   -  Cart Product Name strictness can be disabled via the Cart Library by switching "$product_name_safe"
+   -  Cart library changes include;
+	 -  It now auto-increments quantity's instead of just resetting it, this is the default behaviour of large e-commerce sites.
+	 -  Product Name strictness can be disabled via the Cart Library by switching "$product_name_safe"
+	 -  Added function remove() to remove a cart item, updating with quantity of 0 seemed like a hack but has remained to retain compatability
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From d054e137917ef1131195679aa8abeb4dbf69e4e4 Mon Sep 17 00:00:00 2001
From: Eric Barnes 
Date: Mon, 19 Dec 2011 00:25:01 -0500
Subject: Added #795 to changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 72b7f7e8a..74c29a509 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -72,7 +72,7 @@ Bug fixes for 3.0
 -  Bug #608 - Fixes an issue with the Image_lib class not clearing properties completely
 -  Fixed bugs (#157 and #174) - the Image_lib clear() function now resets all variables to their default values.
 -  Fixed a bug where using $this->dbforge->create_table() with PostgreSQL database could lead to fetching whole table.
-
+-  Bug #795 - Fixed form method and accept-charset when passing an empty array.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From dc3e4bedb39afe30d95635e5258aaecec4dfd74c Mon Sep 17 00:00:00 2001
From: Eric Barnes 
Date: Mon, 19 Dec 2011 13:48:29 -0500
Subject: Fixed year and month seconds for timespan().

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 74c29a509..44c9432a2 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -73,6 +73,7 @@ Bug fixes for 3.0
 -  Fixed bugs (#157 and #174) - the Image_lib clear() function now resets all variables to their default values.
 -  Fixed a bug where using $this->dbforge->create_table() with PostgreSQL database could lead to fetching whole table.
 -  Bug #795 - Fixed form method and accept-charset when passing an empty array.
+-  Bug #797 - timespan was using incorrect seconds for year and month.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 0d91fd2956812e07905d8047ef95a0e556edbb1a Mon Sep 17 00:00:00 2001
From: Mancy 
Date: Tue, 20 Dec 2011 13:13:14 +0300
Subject: #798: update changelog and typo fix

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 74c29a509..4e0f04105 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -40,6 +40,7 @@ Release Date: Not Released
    -  Added new :doc:`Active Record ` methods that return
       the SQL string of queries without executing them: get_compiled_select(),
       get_compiled_insert(), get_compiled_update(), get_compiled_delete().
+   -  Taking care of LIKE condition when used with MySQL UPDATE statement.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From bb2488305194e50881df0971bf4f33f30d974d36 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 21 Dec 2011 16:42:51 +0200
Subject: Improved the Cart library

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 62f60b1bb..8a7109feb 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -75,6 +75,7 @@ Bug fixes for 3.0
 -  Fixed a bug where using $this->dbforge->create_table() with PostgreSQL database could lead to fetching whole table.
 -  Bug #795 - Fixed form method and accept-charset when passing an empty array.
 -  Bug #797 - timespan was using incorrect seconds for year and month.
+-  Fixed a bug in CI_Cart::contents() where if called without a TRUE (or equal) parameter, it would fail due to a typo.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From a92b903c0e6c2faa2a9480e23e2d3e4b6308878f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 24 Dec 2011 19:05:58 +0200
Subject: Improve the Image manipulation library

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8a7109feb..6c80be569 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -76,6 +76,7 @@ Bug fixes for 3.0
 -  Bug #795 - Fixed form method and accept-charset when passing an empty array.
 -  Bug #797 - timespan was using incorrect seconds for year and month.
 -  Fixed a bug in CI_Cart::contents() where if called without a TRUE (or equal) parameter, it would fail due to a typo.
+-  Fixed a bug in CI_Image_lib::gd_loaded() where it was possible for the script execution to end or a PHP E_WARNING message to be emitted.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From f41c9cfbda27c71a1f34ef1ba7e15cad93564691 Mon Sep 17 00:00:00 2001
From: Greg Aker 
Date: Sun, 25 Dec 2011 00:15:17 -0600
Subject: Updating changelog & adding a migrations documentation file so those
 docs can be started on.

---
 user_guide_src/source/changelog.rst | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8a7109feb..4f060a4fa 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -41,6 +41,7 @@ Release Date: Not Released
       the SQL string of queries without executing them: get_compiled_select(),
       get_compiled_insert(), get_compiled_update(), get_compiled_delete().
    -  Taking care of LIKE condition when used with MySQL UPDATE statement.
+   -  Adding $escape parameter to the order_by function, this enables ordering by custom fields.
 
 -  Libraries
 
@@ -48,10 +49,11 @@ Release Date: Not Released
    -  CI_Loader::_ci_autoloader() is now a protected method.
    -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Form Validation library `.
 	 -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname)
-   -  Cart library changes include;
+   -  Cart library changes include:
 	 -  It now auto-increments quantity's instead of just resetting it, this is the default behaviour of large e-commerce sites.
 	 -  Product Name strictness can be disabled via the Cart Library by switching "$product_name_safe"
 	 -  Added function remove() to remove a cart item, updating with quantity of 0 seemed like a hack but has remained to retain compatability
+   -  Minor speed optimizations and method & property visibility declarations in the Calendar Library.
 
 -  Core
 
@@ -67,15 +69,16 @@ Bug fixes for 3.0
    language file.
 -  Fixed a bug (#159, #163) that mishandled Active Record nested transactions because _trans_depth was not getting incremented.
 -  Fixed a bug (#737, #75) where pagination anchor class was not set properly when using initialize method.
--  Bug #419 - auto_link() now recognizes URLs that come after a word boundary.
--  Bug #724 - is_unique in form validation now checks that you are connected to a database.
--  Bug #647 - _get_mod_time() in Zip library no longer generates stat failed errors
--  Bug #608 - Fixes an issue with the Image_lib class not clearing properties completely
+-  Fixed a bug (#419) - auto_link() now recognizes URLs that come after a word boundary.
+-  Fixed a bug (#724) - is_unique in form validation now checks that you are connected to a database.
+-  Fixed a bug (#647) - _get_mod_time() in Zip library no longer generates stat failed errors
+-  Fixed a bug (#608) - Fixes an issue with the Image_lib class not clearing properties completely
 -  Fixed bugs (#157 and #174) - the Image_lib clear() function now resets all variables to their default values.
 -  Fixed a bug where using $this->dbforge->create_table() with PostgreSQL database could lead to fetching whole table.
--  Bug #795 - Fixed form method and accept-charset when passing an empty array.
--  Bug #797 - timespan was using incorrect seconds for year and month.
+-  Fixed a bug (#795) - Fixed form method and accept-charset when passing an empty array.
+-  Fixed a bug (#797) - timespan was using incorrect seconds for year and month.
 -  Fixed a bug in CI_Cart::contents() where if called without a TRUE (or equal) parameter, it would fail due to a typo.
+-  Fixed a bug (#696) - make oci_execute calls inside num_rows non-committing, since they are only there to reset which row is next in line for oci_fetch calls and thus don't need to be committed.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From d1af1854e3444d58907225f46f473723cdf97628 Mon Sep 17 00:00:00 2001
From: Greg Aker 
Date: Sun, 25 Dec 2011 21:59:30 -0600
Subject: Removing previously deprecated SHA1 library and removed SHA1 method
 in the Encryption Library

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 54237e3c7..60425a436 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -28,6 +28,7 @@ Release Date: Not Released
    -  Added support 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
    -  Added support m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
    -  Changed logger to only chmod when file is first created.
+   -  Removed previously deprecated SHA1 Library.
 
 -  Helpers
 
@@ -54,6 +55,7 @@ Release Date: Not Released
 	 -  Product Name strictness can be disabled via the Cart Library by switching "$product_name_safe"
 	 -  Added function remove() to remove a cart item, updating with quantity of 0 seemed like a hack but has remained to retain compatability
    -  Minor speed optimizations and method & property visibility declarations in the Calendar Library.
+   -  Removed SHA1 function in the :doc:`Encryption Library `.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 64dbdfb60e0556177061db2eecdf899111ae4ac9 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 30 Dec 2011 14:14:07 +0200
Subject: Added support for 3-length hex color values format and a number of
 validation improvements

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a9673de88..927705b63 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -53,6 +53,11 @@ Release Date: Not Released
 	 -  It now auto-increments quantity's instead of just resetting it, this is the default behaviour of large e-commerce sites.
 	 -  Product Name strictness can be disabled via the Cart Library by switching "$product_name_safe"
 	 -  Added function remove() to remove a cart item, updating with quantity of 0 seemed like a hack but has remained to retain compatability
+   -  Image manipulation library changes include:
+	 -  The initialize() method now only sets existing class properties.
+	 -  Added support for 3-length hex color values for wm_font_color and wm_shadow_color properties, as well as validation for them.
+	 -  Class properties wm_font_color, wm_shadow_color and wm_use_drop_shadow are now protected, to avoid breaking the text_watermark() method
+	    if they are set manually after initialization.
    -  Minor speed optimizations and method & property visibility declarations in the Calendar Library.
 
 -  Core
-- 
cgit v1.2.3-24-g4f1b


From 7c9766a67948613b7fcb141728fb41fcd3ea1844 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 3 Jan 2012 10:18:41 +0200
Subject: Some additions to mimes.php

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 59d2ea88d..f611be5c3 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -24,9 +24,11 @@ Release Date: Not Released
    -  Added Windows 7 to the list of user platforms.
    -  Ability to log certain error types, not all under a threshold.
    -  Added support for pem, p10, p12, p7a, p7c, p7m, p7r, p7s, crt, crl, der, kdb, rsa, cer, sst, csr Certs to mimes.php.
-   -  Added support pgp and gpg to mimes.php.
-   -  Added support 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
-   -  Added support m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
+   -  Added support for pgp and gpg to mimes.php.
+   -  Added support for 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
+   -  Added support for m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
+   -  Added support for kmz and kml (Google Earth) files to mimes.php.
+   -  Added application/xml for xml and application/xml, text/xsl for xsl in mimes.php.
    -  Changed logger to only chmod when file is first created.
    -  Removed previously deprecated SHA1 Library.
 
-- 
cgit v1.2.3-24-g4f1b


From d81150feddf5605d6afe70d4f641f013e42df586 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 3 Jan 2012 11:06:32 +0200
Subject: Update the changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 59d2ea88d..1fa374334 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -89,6 +89,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#696) - make oci_execute calls inside num_rows non-committing, since they are only there to reset which row is next in line for oci_fetch calls and thus don't need to be committed.
 -  Fixed a bug (#406) - sqlsrv DB driver not reuturning resource on db_pconnect().
 -  Fixed a bug in CI_Image_lib::gd_loaded() where it was possible for the script execution to end or a PHP E_WARNING message to be emitted.
+-  Fixed a bug (#561) - Errors in :doc:`XML-RPC Library ` were not properly escaped.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 0fc6409cae13c6be6749e1f160a144fc90713f8b Mon Sep 17 00:00:00 2001
From: RS71 
Date: Tue, 3 Jan 2012 12:50:55 -0200
Subject: Update user_guide_src/source/changelog.rst

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 59d2ea88d..b2f247589 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -61,6 +61,8 @@ Release Date: Not Released
 	    if they are set manually after initialization.
    -  Minor speed optimizations and method & property visibility declarations in the Calendar Library.
    -  Removed SHA1 function in the :doc:`Encryption Library `.
+   -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
+
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 43fcdbcac05a0cdc5c2a77c79c641849c41caa9e Mon Sep 17 00:00:00 2001
From: Eric Barnes 
Date: Wed, 4 Jan 2012 21:27:47 -0500
Subject: Added pagination change log item back.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f611be5c3..668f073df 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -91,6 +91,9 @@ Bug fixes for 3.0
 -  Fixed a bug (#696) - make oci_execute calls inside num_rows non-committing, since they are only there to reset which row is next in line for oci_fetch calls and thus don't need to be committed.
 -  Fixed a bug (#406) - sqlsrv DB driver not reuturning resource on db_pconnect().
 -  Fixed a bug in CI_Image_lib::gd_loaded() where it was possible for the script execution to end or a PHP E_WARNING message to be emitted.
+-  In Pagination library, when use_page_numbers=TRUE previous link and page 1 link do not have the same url
+
+
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 24abcb98d4281dcf857cb08a86a58af286a2f94a Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 5 Jan 2012 20:40:15 +0200
Subject: Numerous improvements to the Oracle (oci8) driver and DB_driver

---
 user_guide_src/source/changelog.rst | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 668f073df..2d76f81c9 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -45,6 +45,12 @@ Release Date: Not Released
       get_compiled_insert(), get_compiled_update(), get_compiled_delete().
    -  Taking care of LIKE condition when used with MySQL UPDATE statement.
    -  Adding $escape parameter to the order_by function, this enables ordering by custom fields.
+   -  Improved support of the Oracle (OCI8) driver, including:
+         -  Added support for dropping tables to :doc:`Database Forge `.
+         -  Added support for listing database schemas to :doc:`Database Utilities `.
+         -  Generally improved for speed and cleaned up all of its components.
+         -  *Row* result methods now really only fetch only the needed number of rows, instead of depending entirely on ``result()``.
+         -  ``num_rows()`` is now only called explicitly by the developer and no longer re-executes statements.
 
 -  Libraries
 
@@ -75,8 +81,7 @@ Bug fixes for 3.0
 ------------------
 
 -  Unlink raised an error if cache file did not exist when you try to delete it.
--  Fixed a bug (#181) where a mis-spelling was in the form validation
-   language file.
+-  Fixed a bug (#181) where a mis-spelling was in the form validation language file.
 -  Fixed a bug (#159, #163) that mishandled Active Record nested transactions because _trans_depth was not getting incremented.
 -  Fixed a bug (#737, #75) where pagination anchor class was not set properly when using initialize method.
 -  Fixed a bug (#419) - auto_link() now recognizes URLs that come after a word boundary.
@@ -92,8 +97,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#406) - sqlsrv DB driver not reuturning resource on db_pconnect().
 -  Fixed a bug in CI_Image_lib::gd_loaded() where it was possible for the script execution to end or a PHP E_WARNING message to be emitted.
 -  In Pagination library, when use_page_numbers=TRUE previous link and page 1 link do not have the same url
-
-
+-  Fixed a bug in the Oracle (oci8) instance of :doc:`Database Forge Class ` where ``create_table()`` would fail if used with ``AUTO_INCREMENT`` as it's not supported by Oracle.
 
 Version 2.1.0
 =============
@@ -156,11 +160,9 @@ Release Date: Not Released
       override them.
    -  Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
 
-
 Bug fixes for 2.1.0
 -------------------
 
-
 -  Fixed #378 Robots identified as regular browsers by the User Agent
    class.
 -  If a config class was loaded first then a library with the same name
@@ -1159,7 +1161,7 @@ Bug fixes for 1.6.3
 
 -  Added a language key for valid_emails in validation_lang.php.
 -  Amended fixes for bug (#3419) with parsing DSN database connections.
--  Moved the _has_operators() function (#4535) into DB_driver from
+-  Moved the _has_operator() function (#4535) into DB_driver from
    DB_active_rec.
 -  Fixed a syntax error in upload_lang.php.
 -  Fixed a bug (#4542) with a regular expression in the Image library.
-- 
cgit v1.2.3-24-g4f1b


From dc2ddfedc0660ce6db52db40ffa5667480b7568f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 5 Jan 2012 21:49:19 +0200
Subject: Update the changelog for #413

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2d76f81c9..5a290e73d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -98,6 +98,7 @@ Bug fixes for 3.0
 -  Fixed a bug in CI_Image_lib::gd_loaded() where it was possible for the script execution to end or a PHP E_WARNING message to be emitted.
 -  In Pagination library, when use_page_numbers=TRUE previous link and page 1 link do not have the same url
 -  Fixed a bug in the Oracle (oci8) instance of :doc:`Database Forge Class ` where ``create_table()`` would fail if used with ``AUTO_INCREMENT`` as it's not supported by Oracle.
+-  Fixed a bug (#413) - The Oracle (oci8) database driver only used to return connection-related errors in `_error_message()` and `_error_number()`.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 75f7c12815c62782163a54e84707f50459b6ef5d Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sun, 8 Jan 2012 03:49:25 +0200
Subject: Remove loading of ['core'] elements

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 763f58b8f..7e7be0689 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -31,6 +31,8 @@ Release Date: Not Released
    -  Added application/xml for xml and application/xml, text/xsl for xsl in mimes.php.
    -  Changed logger to only chmod when file is first created.
    -  Removed previously deprecated SHA1 Library.
+   -  Removed previously deprecated use of ``$autoload['core']`` in application/config/autoload.php.
+      Only entries in ``$autoload['libraries']`` are auto-loaded now.
 
 -  Helpers
 
@@ -66,10 +68,9 @@ Release Date: Not Released
 
 -  Core
 
-   -  Changed private functions in CI_URI to protected so MY_URI can
-      override them.
+   -  Changed private functions in CI_URI to protected so MY_URI can override them.
    -  Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
-   -  Added method get_vars() to CI_Loader to retrieve all variables loaded with $this->load->vars()
+   -  Added method get_vars() to CI_Loader to retrieve all variables loaded with $this->load->vars().
 
 Bug fixes for 3.0
 ------------------
-- 
cgit v1.2.3-24-g4f1b


From d47baab1bd4d655a68981834d11727ae8c2a3a45 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 9 Jan 2012 16:56:46 +0200
Subject: Fix issue #904

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d9eca7fef..48011f208 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -67,12 +67,12 @@ Release Date: Not Released
    -  Removed SHA1 function in the :doc:`Encryption Library `.
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
 
-
 -  Core
 
    -  Changed private functions in CI_URI to protected so MY_URI can override them.
    -  Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
    -  Added method get_vars() to CI_Loader to retrieve all variables loaded with $this->load->vars().
+   -  is_loaded() function from system/core/Commons.php now returns a reference.
 
 Bug fixes for 3.0
 ------------------
@@ -96,7 +96,7 @@ Bug fixes for 3.0
 -  Fixed a bug in CI_Image_lib::gd_loaded() where it was possible for the script execution to end or a PHP E_WARNING message to be emitted.
 -  In Pagination library, when use_page_numbers=TRUE previous link and page 1 link do not have the same url
 -  Fixed a bug (#561) - Errors in :doc:`XML-RPC Library ` were not properly escaped.
-
+-  Fixed a bug (#904) - ``CI_Loader::initialize()`` caused a PHP Fatal error to be triggered if error level E_STRICT is used.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 901573ce19e905ce28a3f3345c33dedf9c703cd4 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 11 Jan 2012 01:40:48 +0200
Subject: Fix issue 863

---
 user_guide_src/source/changelog.rst | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 48011f208..b82b38e64 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -52,13 +52,13 @@ Release Date: Not Released
 
    -  Added max_filename_increment config setting for Upload library.
    -  CI_Loader::_ci_autoloader() is now a protected method.
-   -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Form Validation library `.
-	 -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname)
+   -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Input library ` (also used by :doc:`Form Validation library `).
+   -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname)
    -  Cart library changes include:
 	 -  It now auto-increments quantity's instead of just resetting it, this is the default behaviour of large e-commerce sites.
 	 -  Product Name strictness can be disabled via the Cart Library by switching "$product_name_safe"
 	 -  Added function remove() to remove a cart item, updating with quantity of 0 seemed like a hack but has remained to retain compatability
-   -  Image manipulation library changes include:
+   -  :doc:`Image Manipulation library ` changes include:
 	 -  The initialize() method now only sets existing class properties.
 	 -  Added support for 3-length hex color values for wm_font_color and wm_shadow_color properties, as well as validation for them.
 	 -  Class properties wm_font_color, wm_shadow_color and wm_use_drop_shadow are now protected, to avoid breaking the text_watermark() method
@@ -66,6 +66,9 @@ Release Date: Not Released
    -  Minor speed optimizations and method & property visibility declarations in the Calendar Library.
    -  Removed SHA1 function in the :doc:`Encryption Library `.
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
+   -  :doc:`Form Validation library ` changes include:
+	 -  _execute() now considers input data to be invalid if a specified rule is not found.
+	 -  Removed method is_numeric() as it exists as a native PHP function and _execute() will find and use that (the 'is_numeric' rule itself is deprecated since 1.6.1).
 
 -  Core
 
@@ -97,11 +100,12 @@ Bug fixes for 3.0
 -  In Pagination library, when use_page_numbers=TRUE previous link and page 1 link do not have the same url
 -  Fixed a bug (#561) - Errors in :doc:`XML-RPC Library ` were not properly escaped.
 -  Fixed a bug (#904) - ``CI_Loader::initialize()`` caused a PHP Fatal error to be triggered if error level E_STRICT is used.
+-  Fixed a bug (#863) - CI_Form_validation::_execute() silently continued to the next rule, if a callback rule method is not found.
 
 Version 2.1.0
 =============
 
-Release Date: Not Released
+Release Date: November 14, 2011
 
 -  General Changes
 
-- 
cgit v1.2.3-24-g4f1b


From 81c87cd453c61a17e28aff2cc3f4ea76d4d19c59 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 12 Jan 2012 17:00:29 +0200
Subject: Update the changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b82b38e64..27a8b5701 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -100,7 +100,7 @@ Bug fixes for 3.0
 -  In Pagination library, when use_page_numbers=TRUE previous link and page 1 link do not have the same url
 -  Fixed a bug (#561) - Errors in :doc:`XML-RPC Library ` were not properly escaped.
 -  Fixed a bug (#904) - ``CI_Loader::initialize()`` caused a PHP Fatal error to be triggered if error level E_STRICT is used.
--  Fixed a bug (#863) - CI_Form_validation::_execute() silently continued to the next rule, if a callback rule method is not found.
+-  Fixed a bug (#11, #183, #863) - CI_Form_validation::_execute() silently continued to the next rule, if a rule method/function is not found.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 8e70b7935181ff56a340a3388080bf4ac6f3428f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 12 Jan 2012 20:19:24 +0200
Subject: CI_Image_lib::image_reproportion() to work if only one of either
 width or height are set

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 48011f208..c6d5e30f6 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -63,6 +63,7 @@ Release Date: Not Released
 	 -  Added support for 3-length hex color values for wm_font_color and wm_shadow_color properties, as well as validation for them.
 	 -  Class properties wm_font_color, wm_shadow_color and wm_use_drop_shadow are now protected, to avoid breaking the text_watermark() method
 	    if they are set manually after initialization.
+	 -  If property maintain_ratio is set to TRUE, image_reproportion() now doesn't need both width and height to be specified.
    -  Minor speed optimizations and method & property visibility declarations in the Calendar Library.
    -  Removed SHA1 function in the :doc:`Encryption Library `.
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
-- 
cgit v1.2.3-24-g4f1b


From cde43687ef19aa23ee6796925270961b760369f3 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 13 Jan 2012 20:16:35 +0200
Subject: Allow native PHP functions used as rules to accept an additional
 parameter

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 27a8b5701..7c2ee26eb 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -69,6 +69,7 @@ Release Date: Not Released
    -  :doc:`Form Validation library ` changes include:
 	 -  _execute() now considers input data to be invalid if a specified rule is not found.
 	 -  Removed method is_numeric() as it exists as a native PHP function and _execute() will find and use that (the 'is_numeric' rule itself is deprecated since 1.6.1).
+	 -  Native PHP functions used as rules can now accept an additional parameter, other than the data itself.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 8ae24c57a1240a5a5e3fbd5755227e5d42b75390 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 16 Jan 2012 13:05:23 +0200
Subject: Add SQLite3 database driver

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 48011f208..e554b57d3 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -47,6 +47,7 @@ Release Date: Not Released
       get_compiled_insert(), get_compiled_update(), get_compiled_delete().
    -  Taking care of LIKE condition when used with MySQL UPDATE statement.
    -  Adding $escape parameter to the order_by function, this enables ordering by custom fields.
+   -  Added support for SQLite3 database driver.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From eea2ff56657dc5f690523cfcd372b760569ef649 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 19 Jan 2012 13:21:53 +0200
Subject: Fix issue #154

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 48011f208..bbfbb8ce0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -97,6 +97,7 @@ Bug fixes for 3.0
 -  In Pagination library, when use_page_numbers=TRUE previous link and page 1 link do not have the same url
 -  Fixed a bug (#561) - Errors in :doc:`XML-RPC Library ` were not properly escaped.
 -  Fixed a bug (#904) - ``CI_Loader::initialize()`` caused a PHP Fatal error to be triggered if error level E_STRICT is used.
+-  Fixed a bug (#154) - ``CI_Session::sess_update()`` caused the session to be destroyed on pages where multiple AJAX requests were executed at once.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 3a91cabf0cb346bbd4d44fe249f9f726101ba310 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 27 Jan 2012 11:42:28 +0200
Subject: Update the changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 48011f208..bc77b201b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -47,6 +47,8 @@ Release Date: Not Released
       get_compiled_insert(), get_compiled_update(), get_compiled_delete().
    -  Taking care of LIKE condition when used with MySQL UPDATE statement.
    -  Adding $escape parameter to the order_by function, this enables ordering by custom fields.
+   -  MySQLi driver now uses mysqli_get_server_info() for server version checking.
+   -  MySQLi driver now supports persistent connections.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 8d5b24a8c55dc1ae7721e10de094c4aba2ca7eae Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 27 Jan 2012 14:37:38 +0200
Subject: Fix issue #128

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 48011f208..71143b99b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -97,6 +97,7 @@ Bug fixes for 3.0
 -  In Pagination library, when use_page_numbers=TRUE previous link and page 1 link do not have the same url
 -  Fixed a bug (#561) - Errors in :doc:`XML-RPC Library ` were not properly escaped.
 -  Fixed a bug (#904) - ``CI_Loader::initialize()`` caused a PHP Fatal error to be triggered if error level E_STRICT is used.
+-  Fixed a bug (#128) - :doc:`Language Library ` did not correctly keep track of loaded language files.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From f055fa98c7c7dbdd44ca485cde9efe112f713123 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 27 Jan 2012 20:36:23 +0200
Subject: Add PHP version check in db_pconnect()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index bc77b201b..e27ff8877 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -48,7 +48,7 @@ Release Date: Not Released
    -  Taking care of LIKE condition when used with MySQL UPDATE statement.
    -  Adding $escape parameter to the order_by function, this enables ordering by custom fields.
    -  MySQLi driver now uses mysqli_get_server_info() for server version checking.
-   -  MySQLi driver now supports persistent connections.
+   -  MySQLi driver now supports persistent connections when running on PHP >= 5.3.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 4304b96d830232badf3604ad7dfd411e7fc8050f Mon Sep 17 00:00:00 2001
From: Iban Eguia 
Date: Fri, 27 Jan 2012 20:23:54 +0100
Subject: Added information to changelog.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 48011f208..ec3570393 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -33,6 +33,7 @@ Release Date: Not Released
    -  Removed previously deprecated SHA1 Library.
    -  Removed previously deprecated use of ``$autoload['core']`` in application/config/autoload.php.
       Only entries in ``$autoload['libraries']`` are auto-loaded now.
+   -  Added some more doctypes.
 
 -  Helpers
 
-- 
cgit v1.2.3-24-g4f1b


From 5b0b5b92034c1e708f24437c8d2317e1daee535a Mon Sep 17 00:00:00 2001
From: Ross Duggan 
Date: Tue, 31 Jan 2012 23:33:14 +0000
Subject: Add note about HTTPS detection change to 3.0 changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index e27ff8877..10f5507eb 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -99,6 +99,7 @@ Bug fixes for 3.0
 -  In Pagination library, when use_page_numbers=TRUE previous link and page 1 link do not have the same url
 -  Fixed a bug (#561) - Errors in :doc:`XML-RPC Library ` were not properly escaped.
 -  Fixed a bug (#904) - ``CI_Loader::initialize()`` caused a PHP Fatal error to be triggered if error level E_STRICT is used.
+-  Fixed a hosting edge case where an empty $_SERVER['HTTPS'] variable would evaluate to 'on'
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 9448afb6da995098ce4ca2d24eb3d82b26434b4b Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 8 Feb 2012 19:49:19 +0200
Subject: Fix CI_Input::is_ajax_request()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c9354dea4..385eb4825 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -101,6 +101,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#904) - ``CI_Loader::initialize()`` caused a PHP Fatal error to be triggered if error level E_STRICT is used.
 -  Fixed a hosting edge case where an empty $_SERVER['HTTPS'] variable would evaluate to 'on'
 -  Fixed a bug (#154) - ``CI_Session::sess_update()`` caused the session to be destroyed on pages where multiple AJAX requests were executed at once.
+-  Fixed a possible bug in ``CI_Input::is_ajax_request()`` where some clients might not send the X-Requested-With HTTP header value exactly as 'XmlHttpRequest'.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 1820933505d6aa8def25d0e74344f878c3ec76ad Mon Sep 17 00:00:00 2001
From: Taufan Aditya 
Date: Thu, 9 Feb 2012 16:07:27 +0700
Subject: Fixed PDO

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 385eb4825..649616e8d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -49,6 +49,8 @@ Release Date: Not Released
    -  Adding $escape parameter to the order_by function, this enables ordering by custom fields.
    -  MySQLi driver now uses mysqli_get_server_info() for server version checking.
    -  MySQLi driver now supports persistent connections when running on PHP >= 5.3.
+   -  Added dsn if the group connections in the config use PDO or any driver which need DSN.
+   -  Improved PDO database support.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From df82e686b666253e2ca02f48ccc7e485657223eb Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 13 Feb 2012 01:09:28 +0200
Subject: Update the changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d14eea7a9..5d4e72bb5 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -52,6 +52,7 @@ Release Date: Not Released
    -  Added dsn if the group connections in the config use PDO or any driver which need DSN.
    -  Improved PDO database support.
    -  Improved support of the Oracle (OCI8) driver, including:
+	 -  Added DSN string support (Easy Connect and TNS).
          -  Added support for dropping tables to :doc:`Database Forge `.
          -  Added support for listing database schemas to :doc:`Database Utilities `.
          -  Generally improved for speed and cleaned up all of its components.
-- 
cgit v1.2.3-24-g4f1b


From 6b58e5611dc7668da86a5a71b11256d342804301 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 13 Feb 2012 01:46:56 +0200
Subject: Fix a changelog entry

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 98bb43f7d..faea35872 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -57,7 +57,7 @@ Release Date: Not Released
    -  Added max_filename_increment config setting for Upload library.
    -  CI_Loader::_ci_autoloader() is now a protected method.
    -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Form Validation library `.
-	 -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname)
+   -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname)
    -  Cart library changes include:
 	 -  It now auto-increments quantity's instead of just resetting it, this is the default behaviour of large e-commerce sites.
 	 -  Product Name strictness can be disabled via the Cart Library by switching "$product_name_safe"
-- 
cgit v1.2.3-24-g4f1b


From 93cac5cc7bd1537788506d577c69852b4895a932 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 14 Feb 2012 14:45:02 +0200
Subject: Fix issue #1039

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index faea35872..a4904fceb 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -105,6 +105,7 @@ Bug fixes for 3.0
 -  Fixed a hosting edge case where an empty $_SERVER['HTTPS'] variable would evaluate to 'on'
 -  Fixed a bug (#154) - ``CI_Session::sess_update()`` caused the session to be destroyed on pages where multiple AJAX requests were executed at once.
 -  Fixed a possible bug in ``CI_Input::is_ajax_request()`` where some clients might not send the X-Requested-With HTTP header value exactly as 'XmlHttpRequest'.
+-  Fixed a bug (#1039) - MySQL's _backup() method failed due to a table name not being escaped.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 76e0435af10579afdc3ed4956aeafa83a17decd3 Mon Sep 17 00:00:00 2001
From: Timothy Warren 
Date: Tue, 14 Feb 2012 11:55:17 -0500
Subject: First iteration of interbase driver

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index faea35872..1e6248f63 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -51,6 +51,7 @@ Release Date: Not Released
    -  MySQLi driver now supports persistent connections when running on PHP >= 5.3.
    -  Added dsn if the group connections in the config use PDO or any driver which need DSN.
    -  Improved PDO database support.
+   -  Added Interbase/Firebird database support via the "interbase" driver
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From d48f30d1f28fb70d6e06bc4c9607993a991e4c42 Mon Sep 17 00:00:00 2001
From: Jamie Rumbelow 
Date: Sun, 19 Feb 2012 12:39:03 +0000
Subject: Adding the change to the release notes

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a4904fceb..5ad3c3cbc 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -42,7 +42,9 @@ Release Date: Not Released
 
 -  Database
 
-   -  Added new :doc:`Active Record ` methods that return
+   -  Renamed the Active Record class to Query Builder to remove confusion with 
+      the Active Record design pattern
+   -  Added new :doc:`Query Builder ` methods that return
       the SQL string of queries without executing them: get_compiled_select(),
       get_compiled_insert(), get_compiled_update(), get_compiled_delete().
    -  Taking care of LIKE condition when used with MySQL UPDATE statement.
-- 
cgit v1.2.3-24-g4f1b


From 11454e039fd82f2fd4ee2f186ad0317e3435f187 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 22 Feb 2012 16:05:47 +0200
Subject: Add an optional database name parameter to db_select()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a4904fceb..6142d8bfb 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -51,6 +51,7 @@ Release Date: Not Released
    -  MySQLi driver now supports persistent connections when running on PHP >= 5.3.
    -  Added dsn if the group connections in the config use PDO or any driver which need DSN.
    -  Improved PDO database support.
+   -  An optional database name parameter was added db_select().
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 82e8ac19d0ffeb3edd56b09d7a272d13903af7cc Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 22 Feb 2012 19:35:34 +0200
Subject: Fix issue 1070

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a4904fceb..00d70f323 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -106,6 +106,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#154) - ``CI_Session::sess_update()`` caused the session to be destroyed on pages where multiple AJAX requests were executed at once.
 -  Fixed a possible bug in ``CI_Input::is_ajax_request()`` where some clients might not send the X-Requested-With HTTP header value exactly as 'XmlHttpRequest'.
 -  Fixed a bug (#1039) - MySQL's _backup() method failed due to a table name not being escaped.
+-  Fixed a bug (#1070) - CI_DB_driver::initialize() didn't set a character set if a database is not selected.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 46e3a9a365e6bae7954f5118db1409faa5f5decd Mon Sep 17 00:00:00 2001
From: Mike Funk 
Date: Fri, 24 Feb 2012 09:38:35 -0500
Subject: added config check, changelog entry, and user guide update.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dc6b29516..0e5fea491 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -72,6 +72,7 @@ Release Date: Not Released
    -  Minor speed optimizations and method & property visibility declarations in the Calendar Library.
    -  Removed SHA1 function in the :doc:`Encryption Library `.
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
+   -  Allowed for setting table class defaults in a config file.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 7c26fab4a3db098ef5c4264c33cd4792c2b7a621 Mon Sep 17 00:00:00 2001
From: Mike Funk 
Date: Fri, 24 Feb 2012 09:45:02 -0500
Subject: updated changelog and user guide.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 00d70f323..fd67ac233 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -71,6 +71,7 @@ Release Date: Not Released
    -  Minor speed optimizations and method & property visibility declarations in the Calendar Library.
    -  Removed SHA1 function in the :doc:`Encryption Library `.
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
+   -  Added all_flashdata method to session class. Returns an associative array of only flashdata.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 326a5e75db1e03e453f488f2d612b0f421806129 Mon Sep 17 00:00:00 2001
From: Mike Funk 
Date: Fri, 24 Feb 2012 10:06:28 -0500
Subject: added config process method checking for delimiter values, updated
 changelog and user guide.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dc6b29516..3aa9d6573 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -72,6 +72,7 @@ Release Date: Not Released
    -  Minor speed optimizations and method & property visibility declarations in the Calendar Library.
    -  Removed SHA1 function in the :doc:`Encryption Library `.
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
+   -  Form Validation library now allows setting of error delimiters in the config file via $config['error_prefix'] and $config['error_suffix'].
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 063f5963b01f9c19a2ed070d9e3aa077a2515c21 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 27 Feb 2012 12:20:52 +0200
Subject: Fixed a db_set_charset() bug

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dc6b29516..57b5347e6 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -108,6 +108,7 @@ Bug fixes for 3.0
 -  Fixed a possible bug in ``CI_Input::is_ajax_request()`` where some clients might not send the X-Requested-With HTTP header value exactly as 'XmlHttpRequest'.
 -  Fixed a bug (#1039) - MySQL's _backup() method failed due to a table name not being escaped.
 -  Fixed a bug (#1070) - CI_DB_driver::initialize() didn't set a character set if a database is not selected.
+-  Fixed a bug where db_set_charset() ignored its arguments and always used the configured charset and collation instead.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From fa8cd4c77b1f2da010ab42c09d32844d61fe4029 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 27 Feb 2012 16:00:31 +0200
Subject: Update the changelog entry with issue ID

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 57b5347e6..26585e70f 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -108,7 +108,7 @@ Bug fixes for 3.0
 -  Fixed a possible bug in ``CI_Input::is_ajax_request()`` where some clients might not send the X-Requested-With HTTP header value exactly as 'XmlHttpRequest'.
 -  Fixed a bug (#1039) - MySQL's _backup() method failed due to a table name not being escaped.
 -  Fixed a bug (#1070) - CI_DB_driver::initialize() didn't set a character set if a database is not selected.
--  Fixed a bug where db_set_charset() ignored its arguments and always used the configured charset and collation instead.
+-  Fixed a bug (#638) - db_set_charset() ignored its arguments and always used the configured charset and collation instead.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 04ae0672aa9b9f8e590201e8c3817f307800e2c6 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 27 Feb 2012 23:59:18 +0200
Subject: Add changelog entry

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dc6b29516..7916c4e98 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -108,6 +108,7 @@ Bug fixes for 3.0
 -  Fixed a possible bug in ``CI_Input::is_ajax_request()`` where some clients might not send the X-Requested-With HTTP header value exactly as 'XmlHttpRequest'.
 -  Fixed a bug (#1039) - MySQL's _backup() method failed due to a table name not being escaped.
 -  Fixed a bug (#1070) - CI_DB_driver::initialize() didn't set a character set if a database is not selected.
+-  Fixed a bug (#499) - a CSRF cookie was created even with CSRF protection being disabled.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 08c7c62b57b0d6d8f126e8629b8e8da71bd9636f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 28 Feb 2012 13:23:38 +0200
Subject: Fix escape_like_str()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d5125591c..15b531665 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -114,8 +114,9 @@ Bug fixes for 3.0
 -  Fixed a possible bug in ``CI_Input::is_ajax_request()`` where some clients might not send the X-Requested-With HTTP header value exactly as 'XmlHttpRequest'.
 -  Fixed a bug (#1039) - MySQL's _backup() method failed due to a table name not being escaped.
 -  Fixed a bug (#1070) - CI_DB_driver::initialize() didn't set a character set if a database is not selected.
--  Fixed a bug in the Oracle (oci8) instance of :doc:`Database Forge Class ` where ``create_table()`` would fail if used with ``AUTO_INCREMENT`` as it's not supported by Oracle.
--  Fixed a bug (#413) - The Oracle (oci8) database driver only used to return connection-related errors in `_error_message()` and `_error_number()`.
+-  Fixed a bug in the Oracle (oci8) instance of :doc:`Database Forge Class ` where create_table() would fail if used with AUTO_INCREMENT as it's not supported by Oracle.
+-  Fixed a bug (#413) - The Oracle (oci8) database driver only used to return connection-related errors in _error_message() and _error_number().
+-  Fixed a bug (#68, #414) - Oracle's escape_like_str() didn't properly escape the LIKE wild characters.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 46ac881006b1215e136a875491efb020c59246fb Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 28 Feb 2012 14:32:54 +0200
Subject: Fix issue #177

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dc6b29516..9ed53ba1b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -108,6 +108,7 @@ Bug fixes for 3.0
 -  Fixed a possible bug in ``CI_Input::is_ajax_request()`` where some clients might not send the X-Requested-With HTTP header value exactly as 'XmlHttpRequest'.
 -  Fixed a bug (#1039) - MySQL's _backup() method failed due to a table name not being escaped.
 -  Fixed a bug (#1070) - CI_DB_driver::initialize() didn't set a character set if a database is not selected.
+-  Fixed a bug (#177) - CI_Form_validation::set_value() didn't set the default value if POST data is NULL.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From b38c5dd95644ed73166df34084041cee0efd7d23 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 29 Feb 2012 14:07:45 +0200
Subject: Add an optional set_mime parameter to force_download()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 9ed53ba1b..dc281f4c8 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -39,6 +39,7 @@ Release Date: Not Released
    -  url_title() will now trim extra dashes from beginning and end.
    -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
    -  Changed humanize to include a second param for the separator.
+   -  Added an optional third parameter to force_download() that enables/disables sending the actual file MIME type in the Content-Type header (disabled by default).
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From 002b4be248e448227a718e6f7d9ee39ccc575745 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon 
Date: Wed, 29 Feb 2012 12:12:49 +0000
Subject: Improved plural() and singular(). Avoids double-pluralization using
 "uncountable words" and better logic.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 39f8d3d1b..2777d6e0b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -39,6 +39,8 @@ Release Date: Not Released
    -  url_title() will now trim extra dashes from beginning and end.
    -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
    -  Changed humanize to include a second param for the separator.
+   -  Refactored ``plural()`` and ``singular()`` to avoid double pluralization and 
+support more words.
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From e2fc9af9fef1d3b00ecdf3341dd37ae6755be308 Mon Sep 17 00:00:00 2001
From: Michiel Vugteveen 
Date: Wed, 29 Feb 2012 14:12:01 +0100
Subject: docx and xlsx was already fixes

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dc6b29516..bf3d4eed6 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -28,6 +28,7 @@ Release Date: Not Released
    -  Added support for 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
    -  Added support for m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
    -  Added support for kmz and kml (Google Earth) files to mimes.php.
+   -  Added support for doc files to mimes.php.
    -  Added application/xml for xml and application/xml, text/xsl for xsl in mimes.php.
    -  Changed logger to only chmod when file is first created.
    -  Removed previously deprecated SHA1 Library.
-- 
cgit v1.2.3-24-g4f1b


From adcb8fdc38078f1868f408de21d1a08b59a7781b Mon Sep 17 00:00:00 2001
From: Michiel Vugteveen 
Date: Wed, 29 Feb 2012 14:20:33 +0100
Subject: changelog fix

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 01eccb3b0..d6a9f0d2a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -28,7 +28,7 @@ Release Date: Not Released
    -  Added support for 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
    -  Added support for m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
    -  Added support for kmz and kml (Google Earth) files to mimes.php.
-   -  Added support for doc files to mimes.php.
+   -  Updated support for doc files in mimes.php.
    -  Added application/xml for xml and application/xml, text/xsl for xsl in mimes.php.
    -  Changed logger to only chmod when file is first created.
    -  Removed previously deprecated SHA1 Library.
-- 
cgit v1.2.3-24-g4f1b


From 03a57655f3cdc6c0b9f717f4466a4547247729d3 Mon Sep 17 00:00:00 2001
From: Mike Davies 
Date: Wed, 29 Feb 2012 17:52:36 -0500
Subject: Added support for Wincache when running CI on Windows boxes

Wincache is directly analogous to APC, except with less problems on a Windows environment. Performance wise they are almost identical (for user mode caching at least).

Need to have the Wincache PHP module downloaded from http://www.iis.net/download/wincacheforphp.
---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dc6b29516..e879568ed 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -29,6 +29,7 @@ Release Date: Not Released
    -  Added support for m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
    -  Added support for kmz and kml (Google Earth) files to mimes.php.
    -  Added application/xml for xml and application/xml, text/xsl for xsl in mimes.php.
+   -  Added support for Wincache PHP extension
    -  Changed logger to only chmod when file is first created.
    -  Removed previously deprecated SHA1 Library.
    -  Removed previously deprecated use of ``$autoload['core']`` in application/config/autoload.php.
-- 
cgit v1.2.3-24-g4f1b


From c2905f5884a7d9cd9ae1f70cdc615a5d214652dd Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 1 Mar 2012 14:39:26 +0200
Subject: Fix an Oracle escape_str() bug (#68, #414)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d6a9f0d2a..e8bbf7d14 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -112,6 +112,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1039) - MySQL's _backup() method failed due to a table name not being escaped.
 -  Fixed a bug (#1070) - CI_DB_driver::initialize() didn't set a character set if a database is not selected.
 -  Fixed a bug (#177) - CI_Form_validation::set_value() didn't set the default value if POST data is NULL.
+-  Fixed a bug (#68, #414) - Oracle's escape_str() didn't properly escape LIKE wild characters.
 
 
 Version 2.1.1
-- 
cgit v1.2.3-24-g4f1b


From 41e46a97a43b0d5080bb9ace1b9326266955ef21 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 1 Mar 2012 14:58:17 +0200
Subject: Fix issue #81 (ODBC list_fields(), field_data())

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index e8bbf7d14..bd9776ce1 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -113,7 +113,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1070) - CI_DB_driver::initialize() didn't set a character set if a database is not selected.
 -  Fixed a bug (#177) - CI_Form_validation::set_value() didn't set the default value if POST data is NULL.
 -  Fixed a bug (#68, #414) - Oracle's escape_str() didn't properly escape LIKE wild characters.
-
+-  Fixed a bug (#81) - ODBC's list_fields() and field_data() methods skipped the first column due to odbc_field_*() functions' index starting at 1 instead of 0.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From ef795ac23320c4636152af03c8600f2115f1e6e3 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 1 Mar 2012 15:15:31 +0200
Subject: Fix issue #129 (ODBC num_rows() returning -1 in some cases)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index bd9776ce1..d43291d63 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -114,6 +114,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#177) - CI_Form_validation::set_value() didn't set the default value if POST data is NULL.
 -  Fixed a bug (#68, #414) - Oracle's escape_str() didn't properly escape LIKE wild characters.
 -  Fixed a bug (#81) - ODBC's list_fields() and field_data() methods skipped the first column due to odbc_field_*() functions' index starting at 1 instead of 0.
+-  Fixed a bug (#129) - ODBC's num_rows() returned -1 in some cases, due to not all subdrivers supporting the odbc_num_rows() function.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 6ca407e22104d9ba3ef729c840b7dee903df1531 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 1 Mar 2012 15:33:21 +0200
Subject: Fix issue #153 (E_NOTICE generated by getimagesize())

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d43291d63..ef9fda6cf 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -115,6 +115,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#68, #414) - Oracle's escape_str() didn't properly escape LIKE wild characters.
 -  Fixed a bug (#81) - ODBC's list_fields() and field_data() methods skipped the first column due to odbc_field_*() functions' index starting at 1 instead of 0.
 -  Fixed a bug (#129) - ODBC's num_rows() returned -1 in some cases, due to not all subdrivers supporting the odbc_num_rows() function.
+-  Fixed a bug (#153) - E_NOTICE being generated by getimagesize() in the :doc:`File Uploading library `.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 850f601edef5de5680510c900c3e613bc346fe1b Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 1 Mar 2012 15:58:25 +0200
Subject: Fix issue #611 (SQLSRV _error_message() and _error_number() warnings)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ef9fda6cf..5cfb4014c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -115,7 +115,8 @@ Bug fixes for 3.0
 -  Fixed a bug (#68, #414) - Oracle's escape_str() didn't properly escape LIKE wild characters.
 -  Fixed a bug (#81) - ODBC's list_fields() and field_data() methods skipped the first column due to odbc_field_*() functions' index starting at 1 instead of 0.
 -  Fixed a bug (#129) - ODBC's num_rows() returned -1 in some cases, due to not all subdrivers supporting the odbc_num_rows() function.
--  Fixed a bug (#153) - E_NOTICE being generated by getimagesize() in the :doc:`File Uploading library `.
+-  Fixed a bug (#153) - E_NOTICE being generated by getimagesize() in the :doc:`File Uploading Library `.
+-  Fixed a bug (#611) - SQLSRV's _error_message() and _error_number() methods used to issue warnings when there's no actual error.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 67f71a415c4bd7a206fcfc1a6007d74af4590883 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 1 Mar 2012 16:18:42 +0200
Subject: Fix issue #1036 (is_write_type() returned FALSE for RENAME, OPTIMIZE
 queries)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5cfb4014c..1687d90ab 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -117,6 +117,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#129) - ODBC's num_rows() returned -1 in some cases, due to not all subdrivers supporting the odbc_num_rows() function.
 -  Fixed a bug (#153) - E_NOTICE being generated by getimagesize() in the :doc:`File Uploading Library `.
 -  Fixed a bug (#611) - SQLSRV's _error_message() and _error_number() methods used to issue warnings when there's no actual error.
+-  Fixed a bug (#1036) - is_write_type() method in the :doc:`Database Library ` didn't return TRUE for RENAME and OPTIMIZE queries.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From ed7408282e9fded97ade222f98b43623a0f17d22 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 1 Mar 2012 16:37:08 +0200
Subject: Fix PDO's _version() method where it used to return client version
 instead of the server one

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1687d90ab..b1bef0cd9 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -118,6 +118,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#153) - E_NOTICE being generated by getimagesize() in the :doc:`File Uploading Library `.
 -  Fixed a bug (#611) - SQLSRV's _error_message() and _error_number() methods used to issue warnings when there's no actual error.
 -  Fixed a bug (#1036) - is_write_type() method in the :doc:`Database Library ` didn't return TRUE for RENAME and OPTIMIZE queries.
+-  Fixed a bug in PDO's _version() method where it used to return the client version as opposed to the server one.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From a39d699f90feb359ab994b3d77d71006060afecc Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 1 Mar 2012 19:11:39 +0200
Subject: Fix a bug in PDO's insert_id() (PostgreSQL-specific)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b1bef0cd9..3d3c15897 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -119,6 +119,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#611) - SQLSRV's _error_message() and _error_number() methods used to issue warnings when there's no actual error.
 -  Fixed a bug (#1036) - is_write_type() method in the :doc:`Database Library ` didn't return TRUE for RENAME and OPTIMIZE queries.
 -  Fixed a bug in PDO's _version() method where it used to return the client version as opposed to the server one.
+-  Fixed a bug in PDO's insert_id() method where it could've failed if it's used with Postgre versions prior to 8.1.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From ea3eec9f670ea861a65a3e251d8c518ff47e2506 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 1 Mar 2012 19:16:23 +0200
Subject: Fixed a bug in CUBRID's affected_rows()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3d3c15897..ab8b74097 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -120,6 +120,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1036) - is_write_type() method in the :doc:`Database Library ` didn't return TRUE for RENAME and OPTIMIZE queries.
 -  Fixed a bug in PDO's _version() method where it used to return the client version as opposed to the server one.
 -  Fixed a bug in PDO's insert_id() method where it could've failed if it's used with Postgre versions prior to 8.1.
+-  Fixed a bug in CUBRID's affected_rows() method where a connection resource was passed to cubrid_affected_rows() instead of a result.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 601f8b209d93fe70786776d9170eed5e23201e58 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 1 Mar 2012 20:11:15 +0200
Subject: Fix issue #413 (Oracle _error_message(), _error_number())

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ecf6afcc5..0446c112d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -87,8 +87,7 @@ Bug fixes for 3.0
 ------------------
 
 -  Unlink raised an error if cache file did not exist when you try to delete it.
--  Fixed a bug (#181) where a mis-spelling was in the form validation
-   language file.
+-  Fixed a bug (#181) where a mis-spelling was in the form validation language file.
 -  Fixed a bug (#159, #163) that mishandled Active Record nested transactions because _trans_depth was not getting incremented.
 -  Fixed a bug (#737, #75) where pagination anchor class was not set properly when using initialize method.
 -  Fixed a bug (#419) - auto_link() now recognizes URLs that come after a word boundary.
@@ -122,6 +121,7 @@ Bug fixes for 3.0
 -  Fixed a bug in PDO's insert_id() method where it could've failed if it's used with Postgre versions prior to 8.1.
 -  Fixed a bug in CUBRID's affected_rows() method where a connection resource was passed to cubrid_affected_rows() instead of a result.
 -  Fixed a bug (#638) - db_set_charset() ignored its arguments and always used the configured charset and collation instead.
+-  Fixed a bug (#413) - Oracle's _error_message() and _error_number() methods used to only return connection-related errors.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 963386ba6072d240840b58d6dbe54287edcb04ad Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 2 Mar 2012 01:52:01 +0200
Subject: Fix issue #803 (Profiler library didn't handle objects properly)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 0446c112d..d652f1cbd 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -122,6 +122,7 @@ Bug fixes for 3.0
 -  Fixed a bug in CUBRID's affected_rows() method where a connection resource was passed to cubrid_affected_rows() instead of a result.
 -  Fixed a bug (#638) - db_set_charset() ignored its arguments and always used the configured charset and collation instead.
 -  Fixed a bug (#413) - Oracle's _error_message() and _error_number() methods used to only return connection-related errors.
+-  Fixed a bug (#804) - Profiler library was trying to handle objects as strings in some cases, resulting in warnings being issued by htmlspecialchars().
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 676a0dd74409e7e838b94484ef9ba066dcf6db91 Mon Sep 17 00:00:00 2001
From: Michiel Vugteveen 
Date: Fri, 2 Mar 2012 10:10:34 +0100
Subject: updated error_array #565

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d652f1cbd..6505e7489 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -75,6 +75,7 @@ Release Date: Not Released
    -  Minor speed optimizations and method & property visibility declarations in the Calendar Library.
    -  Removed SHA1 function in the :doc:`Encryption Library `.
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
+   -  Added function error_array() to return all error messages as an array in the Form_validation class.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From effd0133b3fa805e21ec934196e8e7d75608ba00 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 2 Mar 2012 12:34:54 +0200
Subject: Fix issue #1101 (MySQL/MySQLi result field_data())

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 6505e7489..f827faa9f 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -124,6 +124,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#638) - db_set_charset() ignored its arguments and always used the configured charset and collation instead.
 -  Fixed a bug (#413) - Oracle's _error_message() and _error_number() methods used to only return connection-related errors.
 -  Fixed a bug (#804) - Profiler library was trying to handle objects as strings in some cases, resulting in warnings being issued by htmlspecialchars().
+-  Fixed a bug (#1101) - MySQL/MySQLi result method field_data() was implemented as if it was handling a DESCRIBE result instead of the actual result set.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 8f22057724dd8fe2b9d41ba98bfc4da282572c5e Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 2 Mar 2012 13:05:45 +0200
Subject: Fix a bug in Oracle's DB forge _create_table() method (AUTO_INCREMENT
 is not supported)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f827faa9f..cece286c5 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -125,6 +125,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#413) - Oracle's _error_message() and _error_number() methods used to only return connection-related errors.
 -  Fixed a bug (#804) - Profiler library was trying to handle objects as strings in some cases, resulting in warnings being issued by htmlspecialchars().
 -  Fixed a bug (#1101) - MySQL/MySQLi result method field_data() was implemented as if it was handling a DESCRIBE result instead of the actual result set.
+-  Fixed a bug in Oracle's :doc:`Database Forge Class ` method _create_table() where it failed with AUTO_INCREMENT as it's not supported.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 4be5de1d11eefd9f0b7cf0589a2942f067cefe35 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 2 Mar 2012 15:45:41 +0200
Subject: Replaced DB methods _error_message() and _error_number() with error()
 (issue #1097)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index cece286c5..cf139bc1c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -54,7 +54,8 @@ Release Date: Not Released
    -  MySQLi driver now supports persistent connections when running on PHP >= 5.3.
    -  Added dsn if the group connections in the config use PDO or any driver which need DSN.
    -  Improved PDO database support.
-   -  An optional database name parameter was added db_select().
+   -  Added an optional database name parameter to db_select().
+   -  Replaced the _error_message() and _error_number() methods with error(), that returns an array containing the last database error code and message.
 
 -  Libraries
 
@@ -116,13 +117,13 @@ Bug fixes for 3.0
 -  Fixed a bug (#81) - ODBC's list_fields() and field_data() methods skipped the first column due to odbc_field_*() functions' index starting at 1 instead of 0.
 -  Fixed a bug (#129) - ODBC's num_rows() returned -1 in some cases, due to not all subdrivers supporting the odbc_num_rows() function.
 -  Fixed a bug (#153) - E_NOTICE being generated by getimagesize() in the :doc:`File Uploading Library `.
--  Fixed a bug (#611) - SQLSRV's _error_message() and _error_number() methods used to issue warnings when there's no actual error.
+-  Fixed a bug (#611) - SQLSRV's error handling methods used to issue warnings when there's no actual error.
 -  Fixed a bug (#1036) - is_write_type() method in the :doc:`Database Library ` didn't return TRUE for RENAME and OPTIMIZE queries.
 -  Fixed a bug in PDO's _version() method where it used to return the client version as opposed to the server one.
 -  Fixed a bug in PDO's insert_id() method where it could've failed if it's used with Postgre versions prior to 8.1.
 -  Fixed a bug in CUBRID's affected_rows() method where a connection resource was passed to cubrid_affected_rows() instead of a result.
 -  Fixed a bug (#638) - db_set_charset() ignored its arguments and always used the configured charset and collation instead.
--  Fixed a bug (#413) - Oracle's _error_message() and _error_number() methods used to only return connection-related errors.
+-  Fixed a bug (#413) - Oracle's error handling methods used to only return connection-related errors.
 -  Fixed a bug (#804) - Profiler library was trying to handle objects as strings in some cases, resulting in warnings being issued by htmlspecialchars().
 -  Fixed a bug (#1101) - MySQL/MySQLi result method field_data() was implemented as if it was handling a DESCRIBE result instead of the actual result set.
 -  Fixed a bug in Oracle's :doc:`Database Forge Class ` method _create_table() where it failed with AUTO_INCREMENT as it's not supported.
-- 
cgit v1.2.3-24-g4f1b


From 92aeaaa6b56cd02908641b4ee481a0c246874f29 Mon Sep 17 00:00:00 2001
From: Timothy Warren 
Date: Fri, 2 Mar 2012 12:18:11 -0500
Subject: Updated changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 69d7efc6c..9a7fc814c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -78,6 +78,7 @@ Release Date: Not Released
    -  Removed SHA1 function in the :doc:`Encryption Library `.
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
    -  Added function error_array() to return all error messages as an array in the Form_validation class.
+   -  Changed the Session library to select only one row when using database sessions.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 593f798a0b463f45e00a207e4fe4b8cc82dedc35 Mon Sep 17 00:00:00 2001
From: Diogo Osรณrio 
Date: Fri, 2 Mar 2012 18:04:17 +0000
Subject: Made the code more readable, updated the changelog.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 69d7efc6c..1eae6fea0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -128,6 +128,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#804) - Profiler library was trying to handle objects as strings in some cases, resulting in warnings being issued by htmlspecialchars().
 -  Fixed a bug (#1101) - MySQL/MySQLi result method field_data() was implemented as if it was handling a DESCRIBE result instead of the actual result set.
 -  Fixed a bug in Oracle's :doc:`Database Forge Class ` method _create_table() where it failed with AUTO_INCREMENT as it's not supported.
+-  Fixed a bug (#1080) - When using the SMTP protocol, the :doc:`Email Library ` send() method was returning TRUE even if the connection/authentication against the server failed.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 08856b8738ea4fc17b13986c9f2619383cb4a6e9 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 3 Mar 2012 03:19:28 +0200
Subject: Improve DB version() implementation and add pg_version() support

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f00021cd9..ca36ecd31 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -57,6 +57,8 @@ Release Date: Not Released
    -  Added Interbase/Firebird database support via the "interbase" driver
    -  Added an optional database name parameter to db_select().
    -  Replaced the _error_message() and _error_number() methods with error(), that returns an array containing the last database error code and message.
+   -  Improved version() implementation so that drivers that have a native function to get the version number don't have to be defined in the core DB_driver class.
+   -  PostgreSQL driver now uses pg_version() to get the database version number, when possible.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 8e89df8f92444eb02dc73b6c3e66077a4fb3f710 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 3 Mar 2012 03:48:12 +0200
Subject: Add db_set_charset() support for PostgreSQL and change its
 implementation for 'mysql'

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ca36ecd31..6f3b030a0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -59,6 +59,7 @@ Release Date: Not Released
    -  Replaced the _error_message() and _error_number() methods with error(), that returns an array containing the last database error code and message.
    -  Improved version() implementation so that drivers that have a native function to get the version number don't have to be defined in the core DB_driver class.
    -  PostgreSQL driver now uses pg_version() to get the database version number, when possible.
+   -  Added db_set_charset() support for PostgreSQL.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 5fa729827d63774457ad34b57109a2f6ab20d20f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 3 Mar 2012 04:13:20 +0200
Subject: Added _optimize_table() support for PostgreSQL

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 6f3b030a0..cb33336a1 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -58,8 +58,10 @@ Release Date: Not Released
    -  Added an optional database name parameter to db_select().
    -  Replaced the _error_message() and _error_number() methods with error(), that returns an array containing the last database error code and message.
    -  Improved version() implementation so that drivers that have a native function to get the version number don't have to be defined in the core DB_driver class.
-   -  PostgreSQL driver now uses pg_version() to get the database version number, when possible.
-   -  Added db_set_charset() support for PostgreSQL.
+   -  Improved support of the PostgreSQL driver, including:
+	 -  pg_version() is now used to get the database version number, when possible.
+	 -  Added db_set_charset() support.
+	 -  Added _optimize_table() support for the :doc:`Database Utility Class ` (rebuilds table indexes).
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 099c478b2ebafd0a1b74e76221ed06c214e195f4 Mon Sep 17 00:00:00 2001
From: JonoB 
Date: Sun, 4 Mar 2012 14:37:30 +0000
Subject: Allow users to specify an array for validation, instead of alway
 using the $_POST array

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2ada9ee67..2158104f9 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -83,6 +83,7 @@ Release Date: Not Released
    -  Removed SHA1 function in the :doc:`Encryption Library `.
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
    -  Added function error_array() to return all error messages as an array in the Form_validation class.
+   -  Added function set_data() to Form_validation library, which can be used in place of the default $_POST array.
    -  Changed the Session library to select only one row when using database sessions.
 
 -  Core
-- 
cgit v1.2.3-24-g4f1b


From 8af76666474c42b45518c08bec16b4f8d700dd3c Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 5 Mar 2012 14:33:41 +0200
Subject: Partially fix issue #306

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 81be64b4d..0de85a46b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -137,6 +137,7 @@ Bug fixes for 3.0
 -  Fixed a bug in Oracle's :doc:`Database Forge Class ` method _create_table() where it failed with AUTO_INCREMENT as it's not supported.
 -  Fixed a bug (#1080) - When using the SMTP protocol, the :doc:`Email Library ` send() method was returning TRUE even if the connection/authentication against the server failed.
 -  Fixed a bug (#499) - a CSRF cookie was created even with CSRF protection being disabled.
+-  Fixed a bug (#306) - ODBC's insert_id() method was calling non-existent function odbc_insert_id(), which resulted in a fatal error.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 57bdeb61bf199d1ae3ceaede4e9a9af8290ce715 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 5 Mar 2012 15:59:16 +0200
Subject: Removed oci8-specific stuff from DB_driver.php and added a
 constructor to DB_result to handle initialization

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 0de85a46b..533746065 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -62,6 +62,7 @@ Release Date: Not Released
 	 -  pg_version() is now used to get the database version number, when possible.
 	 -  Added db_set_charset() support.
 	 -  Added _optimize_table() support for the :doc:`Database Utility Class ` (rebuilds table indexes).
+   -  Added a constructor to the DB_result class and moved all driver-specific properties and logic out of the base DB_driver class to allow better abstraction.
 
 -  Libraries
 
@@ -138,6 +139,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1080) - When using the SMTP protocol, the :doc:`Email Library ` send() method was returning TRUE even if the connection/authentication against the server failed.
 -  Fixed a bug (#499) - a CSRF cookie was created even with CSRF protection being disabled.
 -  Fixed a bug (#306) - ODBC's insert_id() method was calling non-existent function odbc_insert_id(), which resulted in a fatal error.
+-  Fixed a bug in Oracle's DB_result class where the cursor id passed to it was always NULL.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 2eee0aaacc1b4aff6e1137954dfe1a09c491cdb6 Mon Sep 17 00:00:00 2001
From: Hamza Bhatti 
Date: Mon, 5 Mar 2012 23:23:31 +0400
Subject: Add changelog entry (bug fix for issue #64)

Signed-off-by: Hamza Bhatti 
---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 533746065..2f525b10a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -158,6 +158,7 @@ Release Date: Not Released
 Bug fixes for 2.1.1
 -------------------
 
+-  Fixed a bug (#64) - Regular expression in DB_active_rec.php failed to handle queries containing SQL bracket delimiters in the join condition.
 -  Fixed a bug (#697) - A wrong array key was used in the Upload library to check for mime-types.
 -  Fixed a bug - form_open() compared $action against site_url() instead of base_url().
 -  Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.
-- 
cgit v1.2.3-24-g4f1b


From 567474528e0c1a4e305dbe8787b83e526b46eb02 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon 
Date: Mon, 5 Mar 2012 19:38:08 +0000
Subject: Moved change log entry from 2.1.1 to 3.0.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2f525b10a..683dd5516 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -140,6 +140,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#499) - a CSRF cookie was created even with CSRF protection being disabled.
 -  Fixed a bug (#306) - ODBC's insert_id() method was calling non-existent function odbc_insert_id(), which resulted in a fatal error.
 -  Fixed a bug in Oracle's DB_result class where the cursor id passed to it was always NULL.
+-  Fixed a bug (#64) - Regular expression in DB_active_rec.php failed to handle queries containing SQL bracket delimiters in the join condition.
 
 Version 2.1.1
 =============
@@ -158,7 +159,6 @@ Release Date: Not Released
 Bug fixes for 2.1.1
 -------------------
 
--  Fixed a bug (#64) - Regular expression in DB_active_rec.php failed to handle queries containing SQL bracket delimiters in the join condition.
 -  Fixed a bug (#697) - A wrong array key was used in the Upload library to check for mime-types.
 -  Fixed a bug - form_open() compared $action against site_url() instead of base_url().
 -  Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.
-- 
cgit v1.2.3-24-g4f1b


From 92d68cc37dd8644563bfcc7199fec29e89ecc1ba Mon Sep 17 00:00:00 2001
From: SammyK 
Date: Mon, 5 Mar 2012 17:27:56 -0600
Subject: Updated changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 683dd5516..e376497c9 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -63,6 +63,7 @@ Release Date: Not Released
 	 -  Added db_set_charset() support.
 	 -  Added _optimize_table() support for the :doc:`Database Utility Class ` (rebuilds table indexes).
    -  Added a constructor to the DB_result class and moved all driver-specific properties and logic out of the base DB_driver class to allow better abstraction.
+   -  Removed limit() and order_by() support for UPDATE and DELETE queries in PostgreSQL driver. Postgres does not support those features.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 6b83123dce4a78e06f6eedc7cb1b2bb78d2294f0 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 6 Mar 2012 11:16:57 +0200
Subject: Fixed a bug in CI_Session::_unserialize()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index e376497c9..663e204e1 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -142,6 +142,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#306) - ODBC's insert_id() method was calling non-existent function odbc_insert_id(), which resulted in a fatal error.
 -  Fixed a bug in Oracle's DB_result class where the cursor id passed to it was always NULL.
 -  Fixed a bug (#64) - Regular expression in DB_active_rec.php failed to handle queries containing SQL bracket delimiters in the join condition.
+-  Fixed a bug in the :doc:`Session Library ` where a PHP E_NOTICE error was triggered by _unserialize() due to results from databases such as MSSQL and Oracle being space-padded on the right.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 883f80f7ed758f384847af3db0082f9fb6e525ee Mon Sep 17 00:00:00 2001
From: JonoB 
Date: Mon, 5 Mar 2012 09:51:27 +0000
Subject: Removed reset_validation() method from run() method

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 683dd5516..6c8344248 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -85,6 +85,7 @@ Release Date: Not Released
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
    -  Added function error_array() to return all error messages as an array in the Form_validation class.
    -  Added function set_data() to Form_validation library, which can be used in place of the default $_POST array.
+   -  Added function reset_validation() to form validation library, which resets internal validation variables in case of multiple validation routines.
    -  Changed the Session library to select only one row when using database sessions.
 
 -  Core
-- 
cgit v1.2.3-24-g4f1b


From f5e8e1c61e4ed82db42d82d01c4e52b767effa78 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 6 Mar 2012 13:11:27 +0200
Subject: Changed rewrite_short_tags to have no effect on PHP 5.4

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index bef405ee3..37016f832 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -95,6 +95,7 @@ Release Date: Not Released
    -  Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
    -  Added method get_vars() to CI_Loader to retrieve all variables loaded with $this->load->vars().
    -  is_loaded() function from system/core/Commons.php now returns a reference.
+   -  $config['rewrite_short_tags'] now has no effect when using PHP 5.4 as *
Date: Tue, 6 Mar 2012 19:48:35 +0200
Subject: Resolve _protect_identifiers()/protect_identifiers() usage issues

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 37016f832..b5fb52df4 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -64,6 +64,7 @@ Release Date: Not Released
 	 -  Added _optimize_table() support for the :doc:`Database Utility Class ` (rebuilds table indexes).
    -  Added a constructor to the DB_result class and moved all driver-specific properties and logic out of the base DB_driver class to allow better abstraction.
    -  Removed limit() and order_by() support for UPDATE and DELETE queries in PostgreSQL driver. Postgres does not support those features.
+   -  Removed protect_identifiers() and renamed _protect_identifiers() to it instead - it was just an alias.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From be0ca26c9006981eced5d938060ba5bad4145e3b Mon Sep 17 00:00:00 2001
From: Michiel Vugteveen 
Date: Wed, 7 Mar 2012 19:09:51 +0100
Subject: added method() and is_method()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b5fb52df4..f8c4ba144 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -97,6 +97,8 @@ Release Date: Not Released
    -  Added method get_vars() to CI_Loader to retrieve all variables loaded with $this->load->vars().
    -  is_loaded() function from system/core/Commons.php now returns a reference.
    -  $config['rewrite_short_tags'] now has no effect when using PHP 5.4 as *
Date: Wed, 7 Mar 2012 20:41:37 +0100
Subject: removed is_method

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f8c4ba144..58a4cb76b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -97,8 +97,7 @@ Release Date: Not Released
    -  Added method get_vars() to CI_Loader to retrieve all variables loaded with $this->load->vars().
    -  is_loaded() function from system/core/Commons.php now returns a reference.
    -  $config['rewrite_short_tags'] now has no effect when using PHP 5.4 as *
Date: Wed, 7 Mar 2012 22:49:24 +0200
Subject: Fix issue #501

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 58a4cb76b..4c6fd38bc 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -147,6 +147,7 @@ Bug fixes for 3.0
 -  Fixed a bug in Oracle's DB_result class where the cursor id passed to it was always NULL.
 -  Fixed a bug (#64) - Regular expression in DB_active_rec.php failed to handle queries containing SQL bracket delimiters in the join condition.
 -  Fixed a bug in the :doc:`Session Library ` where a PHP E_NOTICE error was triggered by _unserialize() due to results from databases such as MSSQL and Oracle being space-padded on the right.
+-  Fixed a bug (#501) - set_rules() to check if the request method is not 'POST' before aborting, instead of depending on count($_POST) in the :doc:`Form Validation Library `.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 5d27c43d29fc049497010ea62ac7877a64bfed92 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 8 Mar 2012 12:01:52 +0200
Subject: Fix issue #940

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4c6fd38bc..587c64c5a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -148,6 +148,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#64) - Regular expression in DB_active_rec.php failed to handle queries containing SQL bracket delimiters in the join condition.
 -  Fixed a bug in the :doc:`Session Library ` where a PHP E_NOTICE error was triggered by _unserialize() due to results from databases such as MSSQL and Oracle being space-padded on the right.
 -  Fixed a bug (#501) - set_rules() to check if the request method is not 'POST' before aborting, instead of depending on count($_POST) in the :doc:`Form Validation Library `.
+-  Fixed a bug (#940) - csrf_verify() used to set the CSRF cookie while processing a POST request with no actual POST data, which resulted in validating a request that should be considered invalid.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 07c1ac830b4e98aa40f48baef3dd05fb68c0a836 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon 
Date: Fri, 9 Mar 2012 17:03:37 +0000
Subject: Bumped CodeIgniter's PHP requirement to 5.2.4. Yes I know PHP 5.4
 just came out, and yes I know PHP 5.3 has lovely features, but there are
 plenty of corporate systems running on CodeIgniter and PHP 5.3 still is not
 widely supported enough. CodeIgniter is great for distributed applications,
 and this is the highest we can reasonably go without breaking support. PHP
 5.3 will most likely happen in another year or so. Fingers crossed on that
 one anyway...

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index bef405ee3..7670da10d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -19,6 +19,7 @@ Release Date: Not Released
 
 -  General Changes
 
+   -  PHP 5.1.6 is no longer supported. CodeIgniter now requires PHP 5.2.4.
    -  Added an optional backtrace to php-error template.
    -  Added Android to the list of user agents.
    -  Added Windows 7 to the list of user platforms.
-- 
cgit v1.2.3-24-g4f1b


From 1ae651655888383a4d7f97fbf6e97a7ac00a9630 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 10 Mar 2012 16:11:34 +0200
Subject: Remove PHP 5.1.6-specific code

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index aee992e67..8579218b0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -71,7 +71,6 @@ Release Date: Not Released
 
    -  Added max_filename_increment config setting for Upload library.
    -  CI_Loader::_ci_autoloader() is now a protected method.
-   -  Modified valid_ip() to use PHP's filter_var() when possible (>= PHP 5.2) in the :doc:`Form Validation library `.
    -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname)
    -  Cart library changes include:
 	 -  It now auto-increments quantity's instead of just resetting it, this is the default behaviour of large e-commerce sites.
@@ -99,6 +98,7 @@ Release Date: Not Released
    -  is_loaded() function from system/core/Commons.php now returns a reference.
    -  $config['rewrite_short_tags'] now has no effect when using PHP 5.4 as *`.
 
 Bug fixes for 3.0
 ------------------
-- 
cgit v1.2.3-24-g4f1b


From fce2ed6d1d3026c485e79ce5bf236effc67981be Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sun, 11 Mar 2012 22:04:48 +0200
Subject: Added an Android <= 2.1 specific check to force_download()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8579218b0..139899af0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -43,6 +43,7 @@ Release Date: Not Released
    -  Changed humanize to include a second param for the separator.
    -  Refactored ``plural()`` and ``singular()`` to avoid double pluralization and support more words.
    -  Added an optional third parameter to ``force_download()`` that enables/disables sending the actual file MIME type in the Content-Type header (disabled by default).
+   -  Added a work-around in force_download() for a bug Android <= 2.1, where the filename extension needs to be in uppercase.
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From 0ba29f5aa019b9c4a002fbecacf6ed33f3b68a3d Mon Sep 17 00:00:00 2001
From: nihaopaul 
Date: Mon, 12 Mar 2012 16:46:58 +0800
Subject: form_dropdown() will now also take an array for unity with other form
 helpers.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 139899af0..f462e1b11 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -44,6 +44,7 @@ Release Date: Not Released
    -  Refactored ``plural()`` and ``singular()`` to avoid double pluralization and support more words.
    -  Added an optional third parameter to ``force_download()`` that enables/disables sending the actual file MIME type in the Content-Type header (disabled by default).
    -  Added a work-around in force_download() for a bug Android <= 2.1, where the filename extension needs to be in uppercase.
+   -  form_dropdown() will now also take an array for unity with other form helpers.
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From b81f909f8aaa3bedc3820c0d4c9056b57113b46e Mon Sep 17 00:00:00 2001
From: Roger Herbert 
Date: Mon, 12 Mar 2012 12:46:02 +0000
Subject: updated docs & changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8579218b0..469461e43 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -43,6 +43,7 @@ Release Date: Not Released
    -  Changed humanize to include a second param for the separator.
    -  Refactored ``plural()`` and ``singular()`` to avoid double pluralization and support more words.
    -  Added an optional third parameter to ``force_download()`` that enables/disables sending the actual file MIME type in the Content-Type header (disabled by default).
+   -  Added an optional third parameter to ``timespan()`` that constrains the number of time units displayed.
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From 89338828264a6b50e0eb63c449a96f14f0f84076 Mon Sep 17 00:00:00 2001
From: Taufan Aditya 
Date: Mon, 12 Mar 2012 21:03:37 +0700
Subject: Path helper improvement

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f462e1b11..6900279ec 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -45,6 +45,7 @@ Release Date: Not Released
    -  Added an optional third parameter to ``force_download()`` that enables/disables sending the actual file MIME type in the Content-Type header (disabled by default).
    -  Added a work-around in force_download() for a bug Android <= 2.1, where the filename extension needs to be in uppercase.
    -  form_dropdown() will now also take an array for unity with other form helpers.
+   -  set_realpath() improvement.
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From 95bd1d1a5f5bdccfde53cc27d7d5c20991112643 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 12 Mar 2012 16:22:28 +0200
Subject: Remove collation parameter from db_set_charset() (no longer needed)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2ea810d30..1c9e1992d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -68,6 +68,8 @@ Release Date: Not Released
    -  Added a constructor to the DB_result class and moved all driver-specific properties and logic out of the base DB_driver class to allow better abstraction.
    -  Removed limit() and order_by() support for UPDATE and DELETE queries in PostgreSQL driver. Postgres does not support those features.
    -  Removed protect_identifiers() and renamed _protect_identifiers() to it instead - it was just an alias.
+   -  MySQL and MySQLi drivers now require at least MySQL version 5.1.
+   -  db_set_charset() now only requires one parameter (collation was only needed due to legacy support for MySQL versions prior to 5.1).
 
 -  Libraries
 
@@ -140,7 +142,7 @@ Bug fixes for 3.0
 -  Fixed a bug in PDO's _version() method where it used to return the client version as opposed to the server one.
 -  Fixed a bug in PDO's insert_id() method where it could've failed if it's used with Postgre versions prior to 8.1.
 -  Fixed a bug in CUBRID's affected_rows() method where a connection resource was passed to cubrid_affected_rows() instead of a result.
--  Fixed a bug (#638) - db_set_charset() ignored its arguments and always used the configured charset and collation instead.
+-  Fixed a bug (#638) - db_set_charset() ignored its arguments and always used the configured charset instead.
 -  Fixed a bug (#413) - Oracle's error handling methods used to only return connection-related errors.
 -  Fixed a bug (#804) - Profiler library was trying to handle objects as strings in some cases, resulting in warnings being issued by htmlspecialchars().
 -  Fixed a bug (#1101) - MySQL/MySQLi result method field_data() was implemented as if it was handling a DESCRIBE result instead of the actual result set.
-- 
cgit v1.2.3-24-g4f1b


From 6b535f51fcb94e0a645fda0d0356f4748076877e Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 12 Mar 2012 22:19:13 +0200
Subject: Fix some spaces and alignments in the new Wincache driver

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 0b462b3b7..f9e742264 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -31,7 +31,6 @@ Release Date: Not Released
    -  Added support for kmz and kml (Google Earth) files to mimes.php.
    -  Updated support for doc files in mimes.php.
    -  Added application/xml for xml and application/xml, text/xsl for xsl in mimes.php.
-   -  Added support for Wincache PHP extension
    -  Changed logger to only chmod when file is first created.
    -  Removed previously deprecated SHA1 Library.
    -  Removed previously deprecated use of ``$autoload['core']`` in application/config/autoload.php.
@@ -96,6 +95,7 @@ Release Date: Not Released
    -  Added function set_data() to Form_validation library, which can be used in place of the default $_POST array.
    -  Added function reset_validation() to form validation library, which resets internal validation variables in case of multiple validation routines.
    -  Changed the Session library to select only one row when using database sessions.
+   -  Added a Wincache driver to the `Caching Library `.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From f2915f2787170d681a50db39a6650f48eefc8d7b Mon Sep 17 00:00:00 2001
From: Taufan Aditya 
Date: Wed, 14 Mar 2012 00:02:39 +0700
Subject: New line and changelog correction

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 6900279ec..e01cdf391 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -45,7 +45,7 @@ Release Date: Not Released
    -  Added an optional third parameter to ``force_download()`` that enables/disables sending the actual file MIME type in the Content-Type header (disabled by default).
    -  Added a work-around in force_download() for a bug Android <= 2.1, where the filename extension needs to be in uppercase.
    -  form_dropdown() will now also take an array for unity with other form helpers.
-   -  set_realpath() improvement.
+   -  set_realpath() can now also handle file paths as opposed to just directories.
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From 4ad0fd86e8dc6dba74305dbb0c88c593b46a19a2 Mon Sep 17 00:00:00 2001
From: freewil 
Date: Tue, 13 Mar 2012 22:37:42 -0400
Subject: add support for httponly cookies

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f9e742264..de0eb84c2 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -35,6 +35,8 @@ Release Date: Not Released
    -  Removed previously deprecated SHA1 Library.
    -  Removed previously deprecated use of ``$autoload['core']`` in application/config/autoload.php.
       Only entries in ``$autoload['libraries']`` are auto-loaded now.
+   -  Added support for HttpOnly cookies with new config option ``cookie_httponly`` (Off by default).
+      This affects session and CSRF cookies, as well as the behavior of set_cookie() in the Input library and cookie helper.
 
 -  Helpers
 
-- 
cgit v1.2.3-24-g4f1b


From 8840c96cc0608859ad4b5341c31db9bb1f833792 Mon Sep 17 00:00:00 2001
From: freewil 
Date: Sun, 18 Mar 2012 15:23:09 -0400
Subject: use php's hash() function for do_hash() helper

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 274026481..45bd41beb 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -47,6 +47,7 @@ Release Date: Not Released
    -  Added a work-around in force_download() for a bug Android <= 2.1, where the filename extension needs to be in uppercase.
    -  form_dropdown() will now also take an array for unity with other form helpers.
    -  set_realpath() can now also handle file paths as opposed to just directories.
+   -  do_hash() now uses PHP's native hash() function, supporting more algorithms.
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From 50bff7c06c177f580db956ef5df9a490141de5f6 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 19 Mar 2012 12:16:38 +0200
Subject: Fix possible error messages with do_hash() and alter a changelog
 entry

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1c709d4d5..5dcf54dd9 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -35,8 +35,6 @@ Release Date: Not Released
    -  Removed previously deprecated SHA1 Library.
    -  Removed previously deprecated use of ``$autoload['core']`` in application/config/autoload.php.
       Only entries in ``$autoload['libraries']`` are auto-loaded now.
-   -  Added support for HttpOnly cookies with new config option ``cookie_httponly`` (Off by default).
-      This affects session and CSRF cookies, as well as the behavior of set_cookie() in the Input library and cookie helper.
 
 -  Helpers
 
@@ -111,6 +109,7 @@ Release Date: Not Released
    -  $config['rewrite_short_tags'] now has no effect when using PHP 5.4 as *`.
+   -  Added support for HTTP-Only cookies with new config option ``cookie_httponly`` (default FALSE).
 
 Bug fixes for 3.0
 ------------------
-- 
cgit v1.2.3-24-g4f1b


From 13707203a18785476948202a32c8d9eeae5a1676 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 20 Mar 2012 00:13:06 +0200
Subject: Changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 6d596a4a1..f50d284a9 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -56,8 +56,10 @@ Release Date: Not Released
       get_compiled_insert(), get_compiled_update(), get_compiled_delete().
    -  Taking care of LIKE condition when used with MySQL UPDATE statement.
    -  Adding $escape parameter to the order_by function, this enables ordering by custom fields.
-   -  MySQLi driver now uses mysqli_get_server_info() for server version checking.
-   -  MySQLi driver now supports persistent connections when running on PHP >= 5.3.
+   -  Improved support for the MySQLi driver, including:
+	 -  OOP style of the PHP extension is now used, instead of the procedural aliases.
+	 -  Server version checking is now done via ``mysqli::$server_info`` instead of running an SQL query.
+	 -  Added persistent connections support for PHP >= 5.3.
    -  Added dsn if the group connections in the config use PDO or any driver which need DSN.
    -  Improved PDO database support.
    -  Added Interbase/Firebird database support via the "interbase" driver
-- 
cgit v1.2.3-24-g4f1b


From 55201acd0692f02eb5927f412db73b925b6ba738 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 20 Mar 2012 14:20:39 +0200
Subject: Fixed an issue with PostgreSQL's escape_str()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 6d596a4a1..ed0b710c3 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -162,6 +162,7 @@ Bug fixes for 3.0
 -  Fixed a bug in the :doc:`Session Library ` where a PHP E_NOTICE error was triggered by _unserialize() due to results from databases such as MSSQL and Oracle being space-padded on the right.
 -  Fixed a bug (#501) - set_rules() to check if the request method is not 'POST' before aborting, instead of depending on count($_POST) in the :doc:`Form Validation Library `.
 -  Fixed a bug (#940) - csrf_verify() used to set the CSRF cookie while processing a POST request with no actual POST data, which resulted in validating a request that should be considered invalid.
+-  Fixed a bug in PostgreSQL's escape_str() where it didn't properly escape LIKE wild characters.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 603cd2cba9365337bf9e6b7fe4055d22780c0883 Mon Sep 17 00:00:00 2001
From: leandronf 
Date: Thu, 22 Mar 2012 08:10:37 -0300
Subject: Update user_guide_src/source/changelog.rst

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ed0b710c3..f353dbb36 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -100,6 +100,7 @@ Release Date: Not Released
    -  Added function reset_validation() to form validation library, which resets internal validation variables in case of multiple validation routines.
    -  Changed the Session library to select only one row when using database sessions.
    -  Added a Wincache driver to the `Caching Library `.
+   -  Added dsn config setting for Email library.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From d576af40ede1bcd38df98a3b06a095bb0af0625e Mon Sep 17 00:00:00 2001
From: leandronf 
Date: Thu, 22 Mar 2012 19:47:41 -0300
Subject: Update user_guide_src/source/changelog.rst

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f353dbb36..44ecf43d2 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -100,7 +100,7 @@ Release Date: Not Released
    -  Added function reset_validation() to form validation library, which resets internal validation variables in case of multiple validation routines.
    -  Changed the Session library to select only one row when using database sessions.
    -  Added a Wincache driver to the `Caching Library `.
-   -  Added dsn config setting for Email library.
+   -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From a00e50483ab27d8ba3d3a2aa1a5138bfa8c8be70 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 26 Mar 2012 12:23:13 +0300
Subject: Add DSN string and persistent connections support for CUBRID

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 44ecf43d2..42d468eed 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -73,6 +73,8 @@ Release Date: Not Released
    -  Removed protect_identifiers() and renamed _protect_identifiers() to it instead - it was just an alias.
    -  MySQL and MySQLi drivers now require at least MySQL version 5.1.
    -  db_set_charset() now only requires one parameter (collation was only needed due to legacy support for MySQL versions prior to 5.1).
+   -  Added DSN string support for CUBRID.
+   -  Added persistent connections support for CUBRID.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 59ad0af04debb4e10e20fbdfc1827a620a88b7be Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 26 Mar 2012 12:47:45 +0300
Subject: Add DSN string support for Oracle

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 42d468eed..7ec417d42 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -75,6 +75,7 @@ Release Date: Not Released
    -  db_set_charset() now only requires one parameter (collation was only needed due to legacy support for MySQL versions prior to 5.1).
    -  Added DSN string support for CUBRID.
    -  Added persistent connections support for CUBRID.
+   -  Added DSN string support (Easy Connect and TNS) for Oracle.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 968bbbb40d188c2bfff6712555b380bd9678d995 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 26 Mar 2012 12:59:05 +0300
Subject: Minor adjustments in the changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 7ec417d42..7afe8be68 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -58,7 +58,7 @@ Release Date: Not Released
    -  Adding $escape parameter to the order_by function, this enables ordering by custom fields.
    -  MySQLi driver now uses mysqli_get_server_info() for server version checking.
    -  MySQLi driver now supports persistent connections when running on PHP >= 5.3.
-   -  Added dsn if the group connections in the config use PDO or any driver which need DSN.
+   -  Added 'dsn' configuration setting for drivers that support DSN strings (PDO, PostgreSQL, Oracle, ODBC, CUBRID).
    -  Improved PDO database support.
    -  Added Interbase/Firebird database support via the "interbase" driver
    -  Added an optional database name parameter to db_select().
@@ -252,11 +252,9 @@ Release Date: November 14, 2011
       override them.
    -  Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
 
-
 Bug fixes for 2.1.0
 -------------------
 
-
 -  Fixed #378 Robots identified as regular browsers by the User Agent
    class.
 -  If a config class was loaded first then a library with the same name
@@ -1255,7 +1253,7 @@ Bug fixes for 1.6.3
 
 -  Added a language key for valid_emails in validation_lang.php.
 -  Amended fixes for bug (#3419) with parsing DSN database connections.
--  Moved the _has_operators() function (#4535) into DB_driver from
+-  Moved the _has_operator() function (#4535) into DB_driver from
    DB_active_rec.
 -  Fixed a syntax error in upload_lang.php.
 -  Fixed a bug (#4542) with a regular expression in the Image library.
-- 
cgit v1.2.3-24-g4f1b


From c6a68e04169802c8aa82e41634ce350eafd1ec1e Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 26 Mar 2012 14:30:10 +0300
Subject: Add visibility declarations where they remain missing

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 34d6a0b63..47220d61a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -36,6 +36,7 @@ Release Date: Not Released
    -  Removed previously deprecated use of ``$autoload['core']`` in application/config/autoload.php.
       Only entries in ``$autoload['libraries']`` are auto-loaded now.
    -  Added some more doctypes.
+   -  Updated all classes to be written in PHP 5 style, with visibility declarations and no ``var`` usage for properties.
 
 -  Helpers
 
-- 
cgit v1.2.3-24-g4f1b


From a5dd2976044b856a875d50e612a2b39ae05787ea Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 26 Mar 2012 14:43:01 +0300
Subject: Make _initialize() a constructor and rename _call_hook() to call_hook
 in the Hooks class

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 47220d61a..37c38f16a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -117,6 +117,7 @@ Release Date: Not Released
    -  Added method() to CI_Input to retrieve $_SERVER['REQUEST_METHOD'].
    -  Modified valid_ip() to use PHP's filter_var() in the :doc:`Input Library `.
    -  Added support for HTTP-Only cookies with new config option ``cookie_httponly`` (default FALSE).
+   -  Renamed method _call_hook() to call_hook() in the :doc:`Hooks Library `.
 
 Bug fixes for 3.0
 ------------------
-- 
cgit v1.2.3-24-g4f1b


From 7bf0a4ff35efc758ef43b3a848e655285946b8b6 Mon Sep 17 00:00:00 2001
From: Iban Eguia 
Date: Tue, 27 Mar 2012 18:36:15 +0200
Subject: Added doccumentation for the new date helper.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b4bf0cfaa..e5b6eea47 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -40,6 +40,7 @@ Release Date: Not Released
 
 -  Helpers
 
+   -  Date helper will now return now() based on the timezone you specify.
    -  url_title() will now trim extra dashes from beginning and end.
    -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
    -  Changed humanize to include a second param for the separator.
-- 
cgit v1.2.3-24-g4f1b


From a11b16b1af42bbb4ffbc15eeee50a3d3ceb402d5 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 28 Mar 2012 12:22:04 +0300
Subject: Fix a CI_Loader::_ci_load_class() bug

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b4bf0cfaa..4703190a9 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -172,6 +172,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#501) - set_rules() to check if the request method is not 'POST' before aborting, instead of depending on count($_POST) in the :doc:`Form Validation Library `.
 -  Fixed a bug (#940) - csrf_verify() used to set the CSRF cookie while processing a POST request with no actual POST data, which resulted in validating a request that should be considered invalid.
 -  Fixed a bug in PostgreSQL's escape_str() where it didn't properly escape LIKE wild characters.
+-  Fixed a bug in the library loader where some PHP versions wouldn't execute the class constructor.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 3b2587e1559d2cbe751d04f801f999ef3fa4e74c Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 28 Mar 2012 13:39:34 +0300
Subject: Added random ordering support for MSSQL and SQLSRV drivers and
 removed an unused method

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4703190a9..22235ee26 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -80,6 +80,8 @@ Release Date: Not Released
    -  Added DSN string support for CUBRID.
    -  Added persistent connections support for CUBRID.
    -  Added DSN string support (Easy Connect and TNS) for Oracle.
+   -  Added random ordering support for MSSQL.
+   -  Added random ordering support for SQLSRV.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 1366cbcb9f509b52bead3180cf62c2fe9a0b3540 Mon Sep 17 00:00:00 2001
From: Matteo Mattei 
Date: Wed, 28 Mar 2012 14:26:59 +0200
Subject: Add buffer string attach function to changelog.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f9e742264..3dd5fca2a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -75,7 +75,8 @@ Release Date: Not Released
 
    -  Added max_filename_increment config setting for Upload library.
    -  CI_Loader::_ci_autoloader() is now a protected method.
-   -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname)
+   -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname).
+   -  Added possibility to send attachment as buffer string in Email::attach() as $this->email->attach($buffer, $disposition, $newname, $mime).
    -  Cart library changes include:
 	 -  It now auto-increments quantity's instead of just resetting it, this is the default behaviour of large e-commerce sites.
 	 -  Product Name strictness can be disabled via the Cart Library by switching "$product_name_safe"
-- 
cgit v1.2.3-24-g4f1b


From 64bfa0634c991ef98ec3d2d44d862ea99d839854 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 29 Mar 2012 18:54:09 +0300
Subject: Add a missing changelog entry for pull #1227

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 52cd51603..3ea95d9ae 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -176,6 +176,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#940) - csrf_verify() used to set the CSRF cookie while processing a POST request with no actual POST data, which resulted in validating a request that should be considered invalid.
 -  Fixed a bug in PostgreSQL's escape_str() where it didn't properly escape LIKE wild characters.
 -  Fixed a bug in the library loader where some PHP versions wouldn't execute the class constructor.
+-  Fixed a bug (#88) - An unexisting property was used for configuration of the Memcache cache driver.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 937f104c39353ecc513863545b47769143c1c9a1 Mon Sep 17 00:00:00 2001
From: Songpol Sripao-eiam 
Date: Tue, 3 Apr 2012 11:04:33 +0700
Subject: Update changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4fdbda054..272ca348c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -190,6 +190,9 @@ Release Date: Not Released
 -  Libraries
    -  Further improved MIME type detection in the :doc:`File Uploading Library `.
 
+-  Core
+   -  Added get_content_type for get current mime-types :doc:`Core Output Library `.
+   
 -  Helpers
    -  url_title() performance and output improved. You can now use any string as the word delimiter, but 'dash' and 'underscore' are still supported.
 
-- 
cgit v1.2.3-24-g4f1b


From cc0e4152502c368c0f4aa9be0af6b921ef106b81 Mon Sep 17 00:00:00 2001
From: Songpol Sripao-eiam 
Date: Tue, 3 Apr 2012 15:37:02 +0700
Subject: Move changelog line from verion 2.1.1 to version 3.0

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 272ca348c..491f93782 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -124,6 +124,7 @@ Release Date: Not Released
    -  Modified valid_ip() to use PHP's filter_var() in the :doc:`Input Library `.
    -  Added support for HTTP-Only cookies with new config option ``cookie_httponly`` (default FALSE).
    -  Renamed method _call_hook() to call_hook() in the :doc:`Hooks Library `.
+   -  Added get_content_type for get current mime-types :doc:`Core Output Library `.
 
 Bug fixes for 3.0
 ------------------
@@ -190,9 +191,6 @@ Release Date: Not Released
 -  Libraries
    -  Further improved MIME type detection in the :doc:`File Uploading Library `.
 
--  Core
-   -  Added get_content_type for get current mime-types :doc:`Core Output Library `.
-   
 -  Helpers
    -  url_title() performance and output improved. You can now use any string as the word delimiter, but 'dash' and 'underscore' are still supported.
 
-- 
cgit v1.2.3-24-g4f1b


From 00adf1d480f94692a625ec2165e0fcc9171c6e2f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 3 Apr 2012 12:30:50 +0300
Subject: Some improvements to the additions from pull #1234

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 770d68a8e..c3e0e1dc0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -129,8 +129,8 @@ Release Date: Not Released
    -  Added method() to CI_Input to retrieve $_SERVER['REQUEST_METHOD'].
    -  Modified valid_ip() to use PHP's filter_var() in the :doc:`Input Library `.
    -  Added support for HTTP-Only cookies with new config option ``cookie_httponly`` (default FALSE).
-   -  Renamed method _call_hook() to call_hook() in the :doc:`Hooks Library `.
-   -  Added get_content_type for get current mime-types :doc:`Core Output Library `.
+   -  Renamed method _call_hook() to call_hook() in the :doc:`Hooks Library `.
+   -  Added get_content_type() method to the :doc:`Output Library `.
 
 Bug fixes for 3.0
 ------------------
-- 
cgit v1.2.3-24-g4f1b


From d6057485408fab0caaca75ef78434d8077eaadd9 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 3 Apr 2012 14:07:31 +0300
Subject: Fix issue #14

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c3e0e1dc0..0a690a5eb 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -185,6 +185,7 @@ Bug fixes for 3.0
 -  Fixed a bug in PostgreSQL's escape_str() where it didn't properly escape LIKE wild characters.
 -  Fixed a bug in the library loader where some PHP versions wouldn't execute the class constructor.
 -  Fixed a bug (#88) - An unexisting property was used for configuration of the Memcache cache driver.
+-  Fixed a bug (#14) - create_database() method in the :doc:`Database Forge Library ` didn't utilize the configured database character set.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From fd6c2bc7ed0ce474ac08fefb3efe88288368da98 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 3 Apr 2012 16:21:48 +0300
Subject: Fix issue #1238

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 0a690a5eb..9f0d55ad5 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -50,6 +50,7 @@ Release Date: Not Released
    -  form_dropdown() will now also take an array for unity with other form helpers.
    -  set_realpath() can now also handle file paths as opposed to just directories.
    -  do_hash() now uses PHP's native hash() function, supporting more algorithms.
+   -  Added an optional paramater to ``delete_files()`` to enable it to skip deleting files such as .htaccess and index.html.
 
 -  Database
 
@@ -186,6 +187,7 @@ Bug fixes for 3.0
 -  Fixed a bug in the library loader where some PHP versions wouldn't execute the class constructor.
 -  Fixed a bug (#88) - An unexisting property was used for configuration of the Memcache cache driver.
 -  Fixed a bug (#14) - create_database() method in the :doc:`Database Forge Library ` didn't utilize the configured database character set.
+-  Fixed a bug (#1238) - delete_all() in the `Database Caching Library ` used to delete .htaccess and index.html files, which is a potential security risk.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 426faa94502218f110e5391e32aba795fa75b1e8 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 3 Apr 2012 19:03:58 +0300
Subject: Fix an issue in CI_Trackback::validate_url() and do some cleanup and
 optimizations in the library

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 9f0d55ad5..fe0670a82 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -188,6 +188,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#88) - An unexisting property was used for configuration of the Memcache cache driver.
 -  Fixed a bug (#14) - create_database() method in the :doc:`Database Forge Library ` didn't utilize the configured database character set.
 -  Fixed a bug (#1238) - delete_all() in the `Database Caching Library ` used to delete .htaccess and index.html files, which is a potential security risk.
+-  Fixed a bug in :doc:`Trackback Library ` method validate_url() where it didn't actually do anything, due to input not being passed by reference.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 7bf632f4ba3a3db1ae38915efe2026d25acc9539 Mon Sep 17 00:00:00 2001
From: Tobias Tschech 
Date: Wed, 4 Apr 2012 15:18:26 +0300
Subject: Update user_guide_src/source/changelog.rst

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 9929cc368..1c8647bb7 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -194,6 +194,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1238) - delete_all() in the `Database Caching Library ` used to delete .htaccess and index.html files, which is a potential security risk.
 -  Fixed a bug in :doc:`Trackback Library ` method validate_url() where it didn't actually do anything, due to input not being passed by reference.
 -  Fixed a bug (#11, #183, #863) - CI_Form_validation::_execute() silently continued to the next rule, if a rule method/function is not found.
+-  Fixed a bug (#1242) Added Windows path compatibility to function read_dir of ZIP library
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 1f975cad332154f9b27159ba0fdc0ca8b174d82d Mon Sep 17 00:00:00 2001
From: "M. Fauzilkamil Zainuddin" 
Date: Wed, 28 Mar 2012 16:34:55 +0800
Subject: Fixing doc link in changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1c8647bb7..b3f6ced57 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -121,7 +121,12 @@ Release Date: Not Released
    -  Changed the :doc:`Session Library ` to select only one row when using database sessions.
    -  Added all_flashdata() method to session class. Returns an associative array of only flashdata.
    -  Allowed for setting table class defaults in a config file.
-   -  Added a Wincache driver to the `Caching Library `.
+   -  Form Validation library now allows setting of error delimiters in the config file via $config['error_prefix'] and $config['error_suffix'].
+   -  Added function error_array() to return all error messages as an array in the Form_validation class.
+   -  Added function set_data() to Form_validation library, which can be used in place of the default $_POST array.
+   -  Added function reset_validation() to form validation library, which resets internal validation variables in case of multiple validation routines.
+   -  Changed the Session library to select only one row when using database sessions.
+   -  Added a Wincache driver to the :doc:`Caching Library `.
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
 
 -  Core
-- 
cgit v1.2.3-24-g4f1b


From a396c3bf6398d3d5631725078b81b8d2757481e2 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 4 Apr 2012 18:57:39 +0300
Subject: Remove duplicate changelog entries introduced in pull #1225

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b3f6ced57..189dccf0a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -121,11 +121,6 @@ Release Date: Not Released
    -  Changed the :doc:`Session Library ` to select only one row when using database sessions.
    -  Added all_flashdata() method to session class. Returns an associative array of only flashdata.
    -  Allowed for setting table class defaults in a config file.
-   -  Form Validation library now allows setting of error delimiters in the config file via $config['error_prefix'] and $config['error_suffix'].
-   -  Added function error_array() to return all error messages as an array in the Form_validation class.
-   -  Added function set_data() to Form_validation library, which can be used in place of the default $_POST array.
-   -  Added function reset_validation() to form validation library, which resets internal validation variables in case of multiple validation routines.
-   -  Changed the Session library to select only one row when using database sessions.
    -  Added a Wincache driver to the :doc:`Caching Library `.
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
 
@@ -199,7 +194,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1238) - delete_all() in the `Database Caching Library ` used to delete .htaccess and index.html files, which is a potential security risk.
 -  Fixed a bug in :doc:`Trackback Library ` method validate_url() where it didn't actually do anything, due to input not being passed by reference.
 -  Fixed a bug (#11, #183, #863) - CI_Form_validation::_execute() silently continued to the next rule, if a rule method/function is not found.
--  Fixed a bug (#1242) Added Windows path compatibility to function read_dir of ZIP library
+-  Fixed a bug (#1242) - read_dir() in the :doc:`Zip Library ` wasn't compatible with Windows.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 97f3697b6c1c220a32d8e63c5da636e9d725dd8a Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 5 Apr 2012 12:44:36 +0300
Subject: Added a default _insert_batch() method instead of requiring each
 driver to define it and fixed 2 issues related to it

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 189dccf0a..3525b530f 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -195,6 +195,7 @@ Bug fixes for 3.0
 -  Fixed a bug in :doc:`Trackback Library ` method validate_url() where it didn't actually do anything, due to input not being passed by reference.
 -  Fixed a bug (#11, #183, #863) - CI_Form_validation::_execute() silently continued to the next rule, if a rule method/function is not found.
 -  Fixed a bug (#1242) - read_dir() in the :doc:`Zip Library ` wasn't compatible with Windows.
+-  Fixed a bug (#306) - ODBC driver didn't have an _insert_batch() method, which resulted in fatal error being triggered when insert_batch() is used with it.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 17ceeae7ddd5c4eba2b1d0b25a17706b3d873346 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 5 Apr 2012 15:38:30 +0300
Subject: Add replace() support for SQLite/SQLite3

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3525b530f..911996e12 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -90,6 +90,7 @@ Release Date: Not Released
 	 -  Generally improved for speed and cleaned up all of its components.
 	 -  *Row* result methods now really only fetch only the needed number of rows, instead of depending entirely on result().
 	 -  num_rows() is now only called explicitly by the developer and no longer re-executes statements.
+   -  Added replace() support for SQLite.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 6d83cde3ba326f400b11475c51a4becec51c2de8 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 5 Apr 2012 16:20:50 +0300
Subject: Fixed MSSQL and SQLSrv truncate()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 911996e12..81644ecac 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -197,6 +197,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#11, #183, #863) - CI_Form_validation::_execute() silently continued to the next rule, if a rule method/function is not found.
 -  Fixed a bug (#1242) - read_dir() in the :doc:`Zip Library ` wasn't compatible with Windows.
 -  Fixed a bug (#306) - ODBC driver didn't have an _insert_batch() method, which resulted in fatal error being triggered when insert_batch() is used with it.
+-  Fixed a bug in MSSQL and SQLSrv's _truncate() where the TABLE keyword was missing.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From ea09a8a5552f2aacdeab0c88a605fe44047ebd0a Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 6 Apr 2012 20:50:07 +0300
Subject: Renamed _escape_identifiers() to escape_identifiers() and moved it to
 CI_DB_driver

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 81644ecac..3ad930ed1 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -75,7 +75,7 @@ Release Date: Not Released
 	 -  Added _optimize_table() support for the :doc:`Database Utility Class ` (rebuilds table indexes).
    -  Added a constructor to the DB_result class and moved all driver-specific properties and logic out of the base DB_driver class to allow better abstraction.
    -  Removed limit() and order_by() support for UPDATE and DELETE queries in PostgreSQL driver. Postgres does not support those features.
-   -  Removed protect_identifiers() and renamed _protect_identifiers() to it instead - it was just an alias.
+   -  Removed protect_identifiers() and renamed internal method _protect_identifiers() to it instead - it was just an alias.
    -  MySQL and MySQLi drivers now require at least MySQL version 5.1.
    -  db_set_charset() now only requires one parameter (collation was only needed due to legacy support for MySQL versions prior to 5.1).
    -  Added DSN string support for CUBRID.
@@ -91,6 +91,7 @@ Release Date: Not Released
 	 -  *Row* result methods now really only fetch only the needed number of rows, instead of depending entirely on result().
 	 -  num_rows() is now only called explicitly by the developer and no longer re-executes statements.
    -  Added replace() support for SQLite.
+   -  Renamed internal method _escape_identifiers() to escape_identifiers().
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 80144bf2badfa992eaef71337e1557209817027c Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 6 Apr 2012 22:19:26 +0300
Subject: Fix a CI_DB_pdo_driver::trans_commit() bug

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3ad930ed1..923224ecc 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -199,6 +199,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1242) - read_dir() in the :doc:`Zip Library ` wasn't compatible with Windows.
 -  Fixed a bug (#306) - ODBC driver didn't have an _insert_batch() method, which resulted in fatal error being triggered when insert_batch() is used with it.
 -  Fixed a bug in MSSQL and SQLSrv's _truncate() where the TABLE keyword was missing.
+-  Fixed a bug in PDO's trans_commit() method where it failed due to an erroneous property name.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 00541ae101a2044c4223b7b48d97c6afefe94be4 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 9 Apr 2012 11:43:10 +0300
Subject: Extend fix for #798 to work across all DB drivers instead of just
 mysql

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 923224ecc..30793111b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -57,7 +57,6 @@ Release Date: Not Released
    -  Added new :doc:`Active Record ` methods that return
       the SQL string of queries without executing them: get_compiled_select(),
       get_compiled_insert(), get_compiled_update(), get_compiled_delete().
-   -  Taking care of LIKE condition when used with MySQL UPDATE statement.
    -  Adding $escape parameter to the order_by function, this enables ordering by custom fields.
    -  Improved support for the MySQLi driver, including:
 	 -  OOP style of the PHP extension is now used, instead of the procedural aliases.
@@ -200,6 +199,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#306) - ODBC driver didn't have an _insert_batch() method, which resulted in fatal error being triggered when insert_batch() is used with it.
 -  Fixed a bug in MSSQL and SQLSrv's _truncate() where the TABLE keyword was missing.
 -  Fixed a bug in PDO's trans_commit() method where it failed due to an erroneous property name.
+-  Fixed a bug (#798) - update() used to ignore LIKE conditions that were set with like().
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 5f56246efd8ae86b327835ddaf67bc0d726700a3 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 9 Apr 2012 12:06:35 +0300
Subject: Fix AR delete() for Oracle

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 30793111b..5ca688c2c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -200,6 +200,7 @@ Bug fixes for 3.0
 -  Fixed a bug in MSSQL and SQLSrv's _truncate() where the TABLE keyword was missing.
 -  Fixed a bug in PDO's trans_commit() method where it failed due to an erroneous property name.
 -  Fixed a bug (#798) - update() used to ignore LIKE conditions that were set with like().
+-  Fixed a bug in Oracle's delete() method where an erroneous SQL statement was generated when used with limit().
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 5c0e9fe409e9ca87cc9daf39ae9029c026ad01cc Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 9 Apr 2012 12:28:11 +0300
Subject: Fix AR delete() for MSSQL and SQLSRV

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5ca688c2c..2a74503eb 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -200,7 +200,8 @@ Bug fixes for 3.0
 -  Fixed a bug in MSSQL and SQLSrv's _truncate() where the TABLE keyword was missing.
 -  Fixed a bug in PDO's trans_commit() method where it failed due to an erroneous property name.
 -  Fixed a bug (#798) - update() used to ignore LIKE conditions that were set with like().
--  Fixed a bug in Oracle's delete() method where an erroneous SQL statement was generated when used with limit().
+-  Fixed a bug in Oracle's and MSSQL's delete() methods where an erroneous SQL statement was generated when used with limit().
+-  Fixed a bug in SQLSRV's delete() method where like() and limit() conditions were ignored.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From d947eba0bdaf9d86401fdcba9e97706905cacf9d Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 9 Apr 2012 14:58:28 +0300
Subject: Multiple DB Forge improvements  - Replaced driver methods
 _create_database(), _drop_database(), _drop_table() and _rename_table() with
 properties  - Added defaults for the above mentioned platform-specific
 queries, so that not all drivers need to define them  - Improved support for
 the SQLite, ODBC and PDO drivers

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2a74503eb..1e2813014 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -91,6 +91,9 @@ Release Date: Not Released
 	 -  num_rows() is now only called explicitly by the developer and no longer re-executes statements.
    -  Added replace() support for SQLite.
    -  Renamed internal method _escape_identifiers() to escape_identifiers().
+   -  Added SQLite support for drop_table() in :doc:`Database Forge `.
+   -  Added ODBC support for create_database(), drop_database() and drop_table() in :doc:`Database Forge `.
+   -  Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge `.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From b457a4001ce2380e97f36b0a983b477c3e31de69 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 9 Apr 2012 16:11:56 +0300
Subject: DB Utility improvements  - Replaced driver methods _list_databases(),
 _optimize_table() and _repair_table() with properties  - Added defaults for
 optimize_table() and repair_table() SQL strings (FALSE, as those are mostly
 MySQL-specific)  - Added MSSQL/SQLSRV support for optimize_table() (actually
 rebuilds table indexes)  - Switched public driver methods to protected  -
 Improved CUBRID support for list_databases() as it used to only return the
 currently used database  - Minor speed improvements

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1e2813014..8146a5139 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -79,8 +79,7 @@ Release Date: Not Released
    -  db_set_charset() now only requires one parameter (collation was only needed due to legacy support for MySQL versions prior to 5.1).
    -  Added DSN string support for CUBRID.
    -  Added persistent connections support for CUBRID.
-   -  Added random ordering support for MSSQL.
-   -  Added random ordering support for SQLSRV.
+   -  Added random ordering support for MSSQL, SQLSRV.
    -  Added support for SQLite3 database driver.
    -  Improved support of the Oracle (OCI8) driver, including:
 	 -  Added DSN string support (Easy Connect and TNS).
@@ -94,6 +93,8 @@ Release Date: Not Released
    -  Added SQLite support for drop_table() in :doc:`Database Forge `.
    -  Added ODBC support for create_database(), drop_database() and drop_table() in :doc:`Database Forge `.
    -  Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge `.
+   -  Added MSSQL, SQLSRV support for optimize_table() in :doc:`Database Utility `.
+   -  Improved CUBRID support for list_databases() in :doc:`Database Utility ` (until now only the currently used database was returned).
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 8b52222a684892e3306a093821d4507792acd3ea Mon Sep 17 00:00:00 2001
From: Rogerio Prado de Jesus 
Date: Fri, 13 Apr 2012 01:18:03 -0300
Subject: Update Release Date for version 2.1.1 at
 user_guide_src/source/changelog.rst

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8146a5139..5f6d5912c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -210,7 +210,7 @@ Bug fixes for 3.0
 Version 2.1.1
 =============
 
-Release Date: November 14, 2011
+Release Date: Not Released
 
 -  General Changes
    -  Fixed support for docx, xlsx files in mimes.php.
-- 
cgit v1.2.3-24-g4f1b


From 3c0a4529b05ed8b3d9fadf97238e3d462d0ce733 Mon Sep 17 00:00:00 2001
From: Iban Eguia 
Date: Sun, 15 Apr 2012 13:30:44 +0200
Subject: Added the ability to insert objects with insert_batch() in Active
 Reccord.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5f6d5912c..0cac8aea0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -54,6 +54,7 @@ Release Date: Not Released
 
 -  Database
 
+   -  Added the ability to insert objects with insert_batch() in :doc:`Active Record `.
    -  Added new :doc:`Active Record ` methods that return
       the SQL string of queries without executing them: get_compiled_select(),
       get_compiled_insert(), get_compiled_update(), get_compiled_delete().
-- 
cgit v1.2.3-24-g4f1b


From b3f774bbbb81293326136e3e13297c3b8d49dfa4 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 23 Apr 2012 12:57:57 +0300
Subject: Fix issue #1265

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 0cac8aea0..f9b087e83 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -207,6 +207,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#798) - update() used to ignore LIKE conditions that were set with like().
 -  Fixed a bug in Oracle's and MSSQL's delete() methods where an erroneous SQL statement was generated when used with limit().
 -  Fixed a bug in SQLSRV's delete() method where like() and limit() conditions were ignored.
+-  Fixed a bug (#1265) - Database connections were always closed, regardless of the 'pconnect' option value.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From e7bbb1dc97c6f2027db5f24383f8d93c4ba41d82 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 24 Apr 2012 21:11:21 +0300
Subject: Add changelog entry for already fixed issue #23

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f9b087e83..3bd8f989e 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -197,7 +197,7 @@ Bug fixes for 3.0
 -  Fixed a bug in the library loader where some PHP versions wouldn't execute the class constructor.
 -  Fixed a bug (#88) - An unexisting property was used for configuration of the Memcache cache driver.
 -  Fixed a bug (#14) - create_database() method in the :doc:`Database Forge Library ` didn't utilize the configured database character set.
--  Fixed a bug (#1238) - delete_all() in the `Database Caching Library ` used to delete .htaccess and index.html files, which is a potential security risk.
+-  Fixed a bug (#23, #1238) - delete_all() in the `Database Caching Library ` used to delete .htaccess and index.html files, which is a potential security risk.
 -  Fixed a bug in :doc:`Trackback Library ` method validate_url() where it didn't actually do anything, due to input not being passed by reference.
 -  Fixed a bug (#11, #183, #863) - CI_Form_validation::_execute() silently continued to the next rule, if a rule method/function is not found.
 -  Fixed a bug (#1242) - read_dir() in the :doc:`Zip Library ` wasn't compatible with Windows.
-- 
cgit v1.2.3-24-g4f1b


From 72b1076858662f535d42811c005e718f3114a1a8 Mon Sep 17 00:00:00 2001
From: George Petsagourakis 
Date: Wed, 25 Apr 2012 11:26:46 +0300
Subject: Added foreign_characters.php changes in the changelog.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f9b087e83..65790cab1 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -29,6 +29,7 @@ Release Date: Not Released
    -  Added support for 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
    -  Added support for m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
    -  Added support for kmz and kml (Google Earth) files to mimes.php.
+   -  Added Romanian and Greek characters in foreign_characters.php
    -  Updated support for doc files in mimes.php.
    -  Added application/xml for xml and application/xml, text/xsl for xsl in mimes.php.
    -  Changed logger to only chmod when file is first created.
-- 
cgit v1.2.3-24-g4f1b


From cdfbd5281e4dec7278a07943832c2590c1141eb3 Mon Sep 17 00:00:00 2001
From: Phil Sturgeon 
Date: Thu, 26 Apr 2012 22:13:31 +0100
Subject: Fixed issue #122 - ruri_string() in subdirs.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1c8647bb7..615e0f734 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -195,6 +195,7 @@ Bug fixes for 3.0
 -  Fixed a bug in :doc:`Trackback Library ` method validate_url() where it didn't actually do anything, due to input not being passed by reference.
 -  Fixed a bug (#11, #183, #863) - CI_Form_validation::_execute() silently continued to the next rule, if a rule method/function is not found.
 -  Fixed a bug (#1242) Added Windows path compatibility to function read_dir of ZIP library
+-  Fixed a bug (#122) Where routed uri string was being reported incorrectly in sub-directories
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 81aa94bbb533737c19a705d5b8864bd47fbab85c Mon Sep 17 00:00:00 2001
From: Phil Sturgeon 
Date: Wed, 2 May 2012 11:40:46 +0100
Subject: Reverted rui_string change.

This had knock-on effects as can be seen in #1306. Issue #122 has been
reopend until it is fixed properly.
---
 user_guide_src/source/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index bdb418f86..95e32f793 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -204,6 +204,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#23, #1238) - delete_all() in the `Database Caching Library ` used to delete .htaccess and index.html files, which is a potential security risk.
 -  Fixed a bug in :doc:`Trackback Library ` method validate_url() where it didn't actually do anything, due to input not being passed by reference.
 -  Fixed a bug (#11, #183, #863) - CI_Form_validation::_execute() silently continued to the next rule, if a rule method/function is not found.
+<<<<<<< HEAD
 -  Fixed a bug (#122) Where routed uri string was being reported incorrectly in sub-directories
 -  Fixed a bug (#1242) - read_dir() in the :doc:`Zip Library ` wasn't compatible with Windows.
 -  Fixed a bug (#306) - ODBC driver didn't have an _insert_batch() method, which resulted in fatal error being triggered when insert_batch() is used with it.
@@ -214,6 +215,7 @@ Bug fixes for 3.0
 -  Fixed a bug in SQLSRV's delete() method where like() and limit() conditions were ignored.
 -  Fixed a bug (#1265) - Database connections were always closed, regardless of the 'pconnect' option value.
 -  Fixed a bug (#128) - :doc:`Language Library ` did not correctly keep track of loaded language files.
+-  Fixed a bug (#1242) Added Windows path compatibility to function read_dir of ZIP library
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From ee04a913dfd78d394a0e09f01655df0870369512 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 2 May 2012 13:41:23 +0300
Subject: Changelog fix

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 95e32f793..bbbe6f718 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -204,7 +204,6 @@ Bug fixes for 3.0
 -  Fixed a bug (#23, #1238) - delete_all() in the `Database Caching Library ` used to delete .htaccess and index.html files, which is a potential security risk.
 -  Fixed a bug in :doc:`Trackback Library ` method validate_url() where it didn't actually do anything, due to input not being passed by reference.
 -  Fixed a bug (#11, #183, #863) - CI_Form_validation::_execute() silently continued to the next rule, if a rule method/function is not found.
-<<<<<<< HEAD
 -  Fixed a bug (#122) Where routed uri string was being reported incorrectly in sub-directories
 -  Fixed a bug (#1242) - read_dir() in the :doc:`Zip Library ` wasn't compatible with Windows.
 -  Fixed a bug (#306) - ODBC driver didn't have an _insert_batch() method, which resulted in fatal error being triggered when insert_batch() is used with it.
-- 
cgit v1.2.3-24-g4f1b


From 0e18f625e10a8d8ba57c58c8597875c342cfa3e6 Mon Sep 17 00:00:00 2001
From: Michiel Vugteveen 
Date: Fri, 4 May 2012 11:41:32 +0200
Subject: changelog entry

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index bbbe6f718..a70531901 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -55,7 +55,7 @@ Release Date: Not Released
 
 -  Database
 
-   -  Renamed the Active Record class to Query Builder to remove confusion with 
+   -  Renamed the Active Record class to Query Builder to remove confusion with
       the Active Record design pattern
    -  Added new :doc:`Query Builder ` methods that return
    -  Added the ability to insert objects with insert_batch() in :doc:`Query Builder `.
@@ -215,6 +215,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1265) - Database connections were always closed, regardless of the 'pconnect' option value.
 -  Fixed a bug (#128) - :doc:`Language Library ` did not correctly keep track of loaded language files.
 -  Fixed a bug (#1242) Added Windows path compatibility to function read_dir of ZIP library
+-  Fixed a bug (#1314) sess_destroy() did not destroy userdata.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From ca7d822f224033196e0e327944a01f319c90f37f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 11 May 2012 10:59:09 +0300
Subject: User_agent library improvements

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a70531901..4756eb3f5 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -22,7 +22,7 @@ Release Date: Not Released
    -  PHP 5.1.6 is no longer supported. CodeIgniter now requires PHP 5.2.4.
    -  Added an optional backtrace to php-error template.
    -  Added Android to the list of user agents.
-   -  Added Windows 7 to the list of user platforms.
+   -  Added Windows 7, Android, Blackberry and iOS to the list of user platforms.
    -  Ability to log certain error types, not all under a threshold.
    -  Added support for pem, p10, p12, p7a, p7c, p7m, p7r, p7s, crt, crl, der, kdb, rsa, cer, sst, csr Certs to mimes.php.
    -  Added support for pgp and gpg to mimes.php.
-- 
cgit v1.2.3-24-g4f1b


From 46d53fb8799eb2f84798f0e7a5f57b065c2482e2 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 11 May 2012 13:42:24 +0300
Subject: Fix issue #1349

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4756eb3f5..d457a3fbc 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -214,8 +214,9 @@ Bug fixes for 3.0
 -  Fixed a bug in SQLSRV's delete() method where like() and limit() conditions were ignored.
 -  Fixed a bug (#1265) - Database connections were always closed, regardless of the 'pconnect' option value.
 -  Fixed a bug (#128) - :doc:`Language Library ` did not correctly keep track of loaded language files.
--  Fixed a bug (#1242) Added Windows path compatibility to function read_dir of ZIP library
--  Fixed a bug (#1314) sess_destroy() did not destroy userdata.
+-  Fixed a bug (#1242) - Added Windows path compatibility to function read_dir of ZIP library
+-  Fixed a bug (#1314) - sess_destroy() did not destroy userdata.
+-  Fixed a bug (#1349) - get_extension() in the `File Uploading Library ` returned the original filename when it didn't have an actual extension.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 5963db71348a06c14b38e7ce998df4249d4fd45a Mon Sep 17 00:00:00 2001
From: Soesapto Joeni Hantoro 
Date: Tue, 15 May 2012 16:31:18 +0700
Subject: escaping boolean data type for postgre change log

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a70531901..77c7e2ca4 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -100,6 +100,7 @@ Release Date: Not Released
    -  Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge `.
    -  Added MSSQL, SQLSRV support for optimize_table() in :doc:`Database Utility `.
    -  Improved CUBRID support for list_databases() in :doc:`Database Utility ` (until now only the currently used database was returned).
+   -  Added escaping boolean data type for PosgreSQL
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 242925bc084e4d606d5f34bdb49bdf9f5235ec32 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 15 May 2012 13:03:51 +0300
Subject: Minor changes on the pull #1355 additions

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2f2ebce98..d33a6a635 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -77,6 +77,7 @@ Release Date: Not Released
 	 -  pg_version() is now used to get the database version number, when possible.
 	 -  Added db_set_charset() support.
 	 -  Added _optimize_table() support for the :doc:`Database Utility Class ` (rebuilds table indexes).
+	 -  Added boolean data type support in escape().
    -  Added a constructor to the DB_result class and moved all driver-specific properties and logic out of the base DB_driver class to allow better abstraction.
    -  Removed limit() and order_by() support for UPDATE and DELETE queries in PostgreSQL driver. Postgres does not support those features.
    -  Removed protect_identifiers() and renamed internal method _protect_identifiers() to it instead - it was just an alias.
@@ -100,7 +101,6 @@ Release Date: Not Released
    -  Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge `.
    -  Added MSSQL, SQLSRV support for optimize_table() in :doc:`Database Utility `.
    -  Improved CUBRID support for list_databases() in :doc:`Database Utility ` (until now only the currently used database was returned).
-   -  Added escaping boolean data type for PosgreSQL
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 16642c71403f4463dfe6e83c13a0e3120474cd1d Mon Sep 17 00:00:00 2001
From: Timothy Warren 
Date: Thu, 17 May 2012 08:20:16 -0400
Subject: Update inflector docblocks, add changelog entry

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d33a6a635..0066af9ad 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -52,6 +52,7 @@ Release Date: Not Released
    -  set_realpath() can now also handle file paths as opposed to just directories.
    -  do_hash() now uses PHP's native hash() function, supporting more algorithms.
    -  Added an optional paramater to ``delete_files()`` to enable it to skip deleting files such as .htaccess and index.html.
+   -  Removed deprecated helper function ``js_insert_smiley`` from smiley helper.
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From 98fde46fb938694feb1f36e590c4cfa5c97c3261 Mon Sep 17 00:00:00 2001
From: Timothy Warren 
Date: Thu, 17 May 2012 08:33:05 -0400
Subject: Add parens to changelog entry

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 0066af9ad..7fc5ee5a0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -52,7 +52,7 @@ Release Date: Not Released
    -  set_realpath() can now also handle file paths as opposed to just directories.
    -  do_hash() now uses PHP's native hash() function, supporting more algorithms.
    -  Added an optional paramater to ``delete_files()`` to enable it to skip deleting files such as .htaccess and index.html.
-   -  Removed deprecated helper function ``js_insert_smiley`` from smiley helper.
+   -  Removed deprecated helper function ``js_insert_smiley()`` from smiley helper.
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From 97aefa5cd41475d5b404ced56052008beebf8f40 Mon Sep 17 00:00:00 2001
From: Timothy Warren 
Date: Thu, 17 May 2012 08:55:55 -0400
Subject: Added changelog entry

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 7fc5ee5a0..933743c38 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -38,6 +38,7 @@ Release Date: Not Released
       Only entries in ``$autoload['libraries']`` are auto-loaded now.
    -  Added some more doctypes.
    -  Updated all classes to be written in PHP 5 style, with visibility declarations and no ``var`` usage for properties.
+   -  Moved error templates to "application/views/errors"
 
 -  Helpers
 
-- 
cgit v1.2.3-24-g4f1b


From 67a08ed578350d3a25c77855dc3467320be9e6f6 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 19 May 2012 13:35:40 +0300
Subject: Add missing changelog entries from 2.1-stable

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 7fc5ee5a0..6192fecfd 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -241,7 +241,9 @@ Bug fixes for 2.1.1
 -  Fixed a bug - form_open() compared $action against site_url() instead of base_url().
 -  Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.
 -  Fixed a bug (#538) - Windows paths were ignored when using the :doc:`Image Manipulation Library ` to create a new file.
--  Fixed a bug - When database caching was enabled, $this->db->query() checked the cache before binding variables which resulted in cached queries never being found
+-  Fixed a bug - When database caching was enabled, $this->db->query() checked the cache before binding variables which resulted in cached queries never being found.
+-  Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.
+-  Fixed a bug (#726) - PDO put a 'dbname' argument in it's connection string regardless of the database platform in use, which made it impossible to use SQLite.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From 441dfc3a17f48c741a930cfc8a6d667bf0c352ba Mon Sep 17 00:00:00 2001
From: Juan Ignacio Borda 
Date: Sun, 20 May 2012 21:46:32 -0300
Subject: added a comment for unbuffered_row

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 7fc5ee5a0..defac54a2 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -102,6 +102,7 @@ Release Date: Not Released
    -  Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge `.
    -  Added MSSQL, SQLSRV support for optimize_table() in :doc:`Database Utility `.
    -  Improved CUBRID support for list_databases() in :doc:`Database Utility ` (until now only the currently used database was returned).
+   -  Added unbuffered_row() function for getting a row without prefetching whole result (consume less memory)
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 79922c0d963de9728315db02deaf4d2516c94d5b Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 23 May 2012 12:27:17 +0300
Subject: Removed the parameter use in database drivers' _close() and added a
 default _close() method in CI_DB_driver + some changelog fixes

---
 user_guide_src/source/changelog.rst | 53 ++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 30 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 45e6ebc07..a65a658ed 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -9,8 +9,7 @@ Release Date: Not Released
 
 -  License
 
-   -  CodeIgniter has been relicensed with the Open Software License (3.0),
-      eliminating its old proprietary licensing.
+   -  CodeIgniter has been relicensed with the Open Software License (3.0), eliminating its old proprietary licensing.
 
       -  All system files are licensed with OSL 3.0.
       -  Config, error, and sample files shipped in the application folder are
@@ -43,7 +42,7 @@ Release Date: Not Released
 
    -  url_title() will now trim extra dashes from beginning and end.
    -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
-   -  Changed humanize to include a second param for the separator.
+   -  Changed humanize() to include a second param for the separator.
    -  Refactored ``plural()`` and ``singular()`` to avoid double pluralization and support more words.
    -  Added an optional third parameter to ``force_download()`` that enables/disables sending the actual file MIME type in the Content-Type header (disabled by default).
    -  Added an optional third parameter to ``timespan()`` that constrains the number of time units displayed.
@@ -56,21 +55,17 @@ Release Date: Not Released
 
 -  Database
 
-   -  Renamed the Active Record class to Query Builder to remove confusion with
-      the Active Record design pattern
-   -  Added new :doc:`Query Builder ` methods that return
+   -  Renamed the Active Record class to Query Builder to remove confusion with the Active Record design pattern.
    -  Added the ability to insert objects with insert_batch() in :doc:`Query Builder `.
-   -  Added new :doc:`Query Builder ` methods that return
-      the SQL string of queries without executing them: get_compiled_select(),
-      get_compiled_insert(), get_compiled_update(), get_compiled_delete().
-   -  Adding $escape parameter to the order_by function, this enables ordering by custom fields.
+   -  Added new :doc:`Query Builder ` methods that return the SQL string of queries without executing them: get_compiled_select(), get_compiled_insert(), get_compiled_update(), get_compiled_delete().
+   -  Adding $escape parameter to the order_by() method, this enables ordering by custom fields.
    -  Improved support for the MySQLi driver, including:
 	 -  OOP style of the PHP extension is now used, instead of the procedural aliases.
 	 -  Server version checking is now done via ``mysqli::$server_info`` instead of running an SQL query.
 	 -  Added persistent connections support for PHP >= 5.3.
    -  Added 'dsn' configuration setting for drivers that support DSN strings (PDO, PostgreSQL, Oracle, ODBC, CUBRID).
    -  Improved PDO database support.
-   -  Added Interbase/Firebird database support via the "interbase" driver
+   -  Added Interbase/Firebird database support via the "interbase" driver.
    -  Added an optional database name parameter to db_select().
    -  Replaced the _error_message() and _error_number() methods with error(), that returns an array containing the last database error code and message.
    -  Improved version() implementation so that drivers that have a native function to get the version number don't have to be defined in the core DB_driver class.
@@ -102,7 +97,7 @@ Release Date: Not Released
    -  Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge `.
    -  Added MSSQL, SQLSRV support for optimize_table() in :doc:`Database Utility `.
    -  Improved CUBRID support for list_databases() in :doc:`Database Utility ` (until now only the currently used database was returned).
-   -  Added unbuffered_row() function for getting a row without prefetching whole result (consume less memory)
+   -  Added unbuffered_row() method for getting a row without prefetching whole result (consume less memory).
 
 -  Libraries
 
@@ -110,17 +105,15 @@ Release Date: Not Released
    -  CI_Loader::_ci_autoloader() is now a protected method.
    -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname).
    -  Added possibility to send attachment as buffer string in Email::attach() as $this->email->attach($buffer, $disposition, $newname, $mime).
-   -  Cart library changes include:
+   -  :doc:`Cart library ` changes include:
 	 -  It now auto-increments quantity's instead of just resetting it, this is the default behaviour of large e-commerce sites.
-	 -  Product Name strictness can be disabled via the Cart Library by switching "$product_name_safe"
-	 -  Added function remove() to remove a cart item, updating with quantity of 0 seemed like a hack but has remained to retain compatability
+	 -  Product Name strictness can be disabled via the Cart Library by switching "$product_name_safe".
+	 -  Added function remove() to remove a cart item, updating with quantity of 0 seemed like a hack but has remained to retain compatability.
    -  :doc:`Image Manipulation library ` changes include:
 	 -  The initialize() method now only sets existing class properties.
 	 -  Added support for 3-length hex color values for wm_font_color and wm_shadow_color properties, as well as validation for them.
-	 -  Class properties wm_font_color, wm_shadow_color and wm_use_drop_shadow are now protected, to avoid breaking the text_watermark() method
-	    if they are set manually after initialization.
+	 -  Class properties wm_font_color, wm_shadow_color and wm_use_drop_shadow are now protected, to avoid breaking the text_watermark() method if they are set manually after initialization.
 	 -  If property maintain_ratio is set to TRUE, image_reproportion() now doesn't need both width and height to be specified.
-   -  Minor speed optimizations and method & property visibility declarations in the Calendar Library.
    -  Removed SHA1 function in the :doc:`Encryption Library `.
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
    -  :doc:`Form Validation library ` changes include:
@@ -153,26 +146,26 @@ Release Date: Not Released
 Bug fixes for 3.0
 ------------------
 
--  Unlink raised an error if cache file did not exist when you try to delete it.
+-  Fixed a bug where ``unlink()`` raised an error if cache file did not exist when you try to delete it.
 -  Fixed a bug (#181) where a mis-spelling was in the form validation language file.
 -  Fixed a bug (#159, #163) that mishandled Active Record nested transactions because _trans_depth was not getting incremented.
 -  Fixed a bug (#737, #75) where pagination anchor class was not set properly when using initialize method.
 -  Fixed a bug (#419) - auto_link() now recognizes URLs that come after a word boundary.
 -  Fixed a bug (#724) - is_unique in form validation now checks that you are connected to a database.
--  Fixed a bug (#647) - _get_mod_time() in Zip library no longer generates stat failed errors
--  Fixed a bug (#608) - Fixes an issue with the Image_lib class not clearing properties completely
--  Fixed bugs (#157 and #174) - the Image_lib clear() function now resets all variables to their default values.
+-  Fixed a bug (#647) - _get_mod_time() in Zip library no longer generates stat failed errors.
+-  Fixed a bug (#608) - Fixes an issue with the Image_lib class not clearing properties completely.
+-  Fixed a bug (#157, #174) - the Image_lib clear() function now resets all variables to their default values.
 -  Fixed a bug where using $this->dbforge->create_table() with PostgreSQL database could lead to fetching whole table.
 -  Fixed a bug (#795) - Fixed form method and accept-charset when passing an empty array.
--  Fixed a bug (#797) - timespan was using incorrect seconds for year and month.
+-  Fixed a bug (#797) - timespan() was using incorrect seconds for year and month.
 -  Fixed a bug in CI_Cart::contents() where if called without a TRUE (or equal) parameter, it would fail due to a typo.
--  Fixed a bug (#696) - make oci_execute calls inside num_rows non-committing, since they are only there to reset which row is next in line for oci_fetch calls and thus don't need to be committed.
--  Fixed a bug (#406) - sqlsrv DB driver not reuturning resource on db_pconnect().
+-  Fixed a bug (#696) - make oci_execute() calls inside num_rows() non-committing, since they are only there to reset which row is next in line for oci_fetch calls and thus don't need to be committed.
+-  Fixed a bug (#406) - sqlsrv DB driver not reuturning resource on ``db_pconnect()``.
 -  Fixed a bug in CI_Image_lib::gd_loaded() where it was possible for the script execution to end or a PHP E_WARNING message to be emitted.
--  In Pagination library, when use_page_numbers=TRUE previous link and page 1 link do not have the same url
+-  Fixed a bug in the :doc:`Pagination library ` where when use_page_numbers=TRUE previous link and page 1 link did not have the same url.
 -  Fixed a bug (#561) - Errors in :doc:`XML-RPC Library ` were not properly escaped.
 -  Fixed a bug (#904) - ``CI_Loader::initialize()`` caused a PHP Fatal error to be triggered if error level E_STRICT is used.
--  Fixed a hosting edge case where an empty $_SERVER['HTTPS'] variable would evaluate to 'on'
+-  Fixed a hosting edge case where an empty $_SERVER['HTTPS'] variable would evaluate to 'on'.
 -  Fixed a bug (#154) - ``CI_Session::sess_update()`` caused the session to be destroyed on pages where multiple AJAX requests were executed at once.
 -  Fixed a possible bug in ``CI_Input::is_ajax_request()`` where some clients might not send the X-Requested-With HTTP header value exactly as 'XmlHttpRequest'.
 -  Fixed a bug (#1039) - MySQL's _backup() method failed due to a table name not being escaped.
@@ -183,7 +176,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#129) - ODBC's num_rows() returned -1 in some cases, due to not all subdrivers supporting the odbc_num_rows() function.
 -  Fixed a bug (#153) - E_NOTICE being generated by getimagesize() in the :doc:`File Uploading Library `.
 -  Fixed a bug (#611) - SQLSRV's error handling methods used to issue warnings when there's no actual error.
--  Fixed a bug (#1036) - is_write_type() method in the :doc:`Database Library ` didn't return TRUE for RENAME and OPTIMIZE queries.
+-  Fixed a bug (#1036) - is_write_type() method in the :doc:`Database Library ` didn't return TRUE for RENAME queries.
 -  Fixed a bug in PDO's _version() method where it used to return the client version as opposed to the server one.
 -  Fixed a bug in PDO's insert_id() method where it could've failed if it's used with Postgre versions prior to 8.1.
 -  Fixed a bug in CUBRID's affected_rows() method where a connection resource was passed to cubrid_affected_rows() instead of a result.
@@ -207,7 +200,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#23, #1238) - delete_all() in the `Database Caching Library ` used to delete .htaccess and index.html files, which is a potential security risk.
 -  Fixed a bug in :doc:`Trackback Library ` method validate_url() where it didn't actually do anything, due to input not being passed by reference.
 -  Fixed a bug (#11, #183, #863) - CI_Form_validation::_execute() silently continued to the next rule, if a rule method/function is not found.
--  Fixed a bug (#122) Where routed uri string was being reported incorrectly in sub-directories
+-  Fixed a bug (#122) Where routed uri string was being reported incorrectly in sub-directories.
 -  Fixed a bug (#1242) - read_dir() in the :doc:`Zip Library ` wasn't compatible with Windows.
 -  Fixed a bug (#306) - ODBC driver didn't have an _insert_batch() method, which resulted in fatal error being triggered when insert_batch() is used with it.
 -  Fixed a bug in MSSQL and SQLSrv's _truncate() where the TABLE keyword was missing.
@@ -217,7 +210,7 @@ Bug fixes for 3.0
 -  Fixed a bug in SQLSRV's delete() method where like() and limit() conditions were ignored.
 -  Fixed a bug (#1265) - Database connections were always closed, regardless of the 'pconnect' option value.
 -  Fixed a bug (#128) - :doc:`Language Library ` did not correctly keep track of loaded language files.
--  Fixed a bug (#1242) - Added Windows path compatibility to function read_dir of ZIP library
+-  Fixed a bug (#1242) - Added Windows path compatibility to function read_dir of ZIP library.
 -  Fixed a bug (#1314) - sess_destroy() did not destroy userdata.
 -  Fixed a bug (#1349) - get_extension() in the `File Uploading Library ` returned the original filename when it didn't have an actual extension.
 
-- 
cgit v1.2.3-24-g4f1b


From f46e726cfb726da2ec2095011ffe8625b6f9c816 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 23 May 2012 13:16:00 +0300
Subject: Fix a typo in the changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a65a658ed..2b15c3f55 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -160,7 +160,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#797) - timespan() was using incorrect seconds for year and month.
 -  Fixed a bug in CI_Cart::contents() where if called without a TRUE (or equal) parameter, it would fail due to a typo.
 -  Fixed a bug (#696) - make oci_execute() calls inside num_rows() non-committing, since they are only there to reset which row is next in line for oci_fetch calls and thus don't need to be committed.
--  Fixed a bug (#406) - sqlsrv DB driver not reuturning resource on ``db_pconnect()``.
+-  Fixed a bug (#406) - sqlsrv DB driver not returning resource on ``db_pconnect()``.
 -  Fixed a bug in CI_Image_lib::gd_loaded() where it was possible for the script execution to end or a PHP E_WARNING message to be emitted.
 -  Fixed a bug in the :doc:`Pagination library ` where when use_page_numbers=TRUE previous link and page 1 link did not have the same url.
 -  Fixed a bug (#561) - Errors in :doc:`XML-RPC Library ` were not properly escaped.
-- 
cgit v1.2.3-24-g4f1b


From 7b5eb7310e5980ffb23fde8a11261e4a40c3b90e Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 24 May 2012 20:52:41 +0300
Subject: Fix issue #1273 and some cleanup in Query Builder

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index e0d745fd8..8ddeb0eac 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -149,7 +149,7 @@ Bug fixes for 3.0
 
 -  Fixed a bug where ``unlink()`` raised an error if cache file did not exist when you try to delete it.
 -  Fixed a bug (#181) where a mis-spelling was in the form validation language file.
--  Fixed a bug (#159, #163) that mishandled Active Record nested transactions because _trans_depth was not getting incremented.
+-  Fixed a bug (#159, #163) that mishandled Query Builder nested transactions because _trans_depth was not getting incremented.
 -  Fixed a bug (#737, #75) where pagination anchor class was not set properly when using initialize method.
 -  Fixed a bug (#419) - auto_link() now recognizes URLs that come after a word boundary.
 -  Fixed a bug (#724) - is_unique in form validation now checks that you are connected to a database.
@@ -190,7 +190,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#499) - a CSRF cookie was created even with CSRF protection being disabled.
 -  Fixed a bug (#306) - ODBC's insert_id() method was calling non-existent function odbc_insert_id(), which resulted in a fatal error.
 -  Fixed a bug in Oracle's DB_result class where the cursor id passed to it was always NULL.
--  Fixed a bug (#64) - Regular expression in DB_active_rec.php failed to handle queries containing SQL bracket delimiters in the join condition.
+-  Fixed a bug (#64) - Regular expression in DB_query_builder.php failed to handle queries containing SQL bracket delimiters in the join condition.
 -  Fixed a bug in the :doc:`Session Library ` where a PHP E_NOTICE error was triggered by _unserialize() due to results from databases such as MSSQL and Oracle being space-padded on the right.
 -  Fixed a bug (#501) - set_rules() to check if the request method is not 'POST' before aborting, instead of depending on count($_POST) in the :doc:`Form Validation Library `.
 -  Fixed a bug (#940) - csrf_verify() used to set the CSRF cookie while processing a POST request with no actual POST data, which resulted in validating a request that should be considered invalid.
@@ -213,7 +213,8 @@ Bug fixes for 3.0
 -  Fixed a bug (#128) - :doc:`Language Library ` did not correctly keep track of loaded language files.
 -  Fixed a bug (#1242) - Added Windows path compatibility to function read_dir of ZIP library.
 -  Fixed a bug (#1314) - sess_destroy() did not destroy userdata.
--  Fixed a bug (#1349) - get_extension() in the `File Uploading Library ` returned the original filename when it didn't have an actual extension.
+-  Fixed a bug (#1349) - get_extension() in the :doc:`File Uploading Library ` returned the original filename when it didn't have an actual extension.
+-  Fixed a bug (#1273) - E_NOTICE being generated by :doc:`Query Builder `'s set_update_batch() method.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 470805b12a8a25faddc9caafe573c15dbd89f8ed Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 24 May 2012 21:57:21 +0300
Subject: Fix issues #44 & #110

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8ddeb0eac..8ee224fc6 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -215,6 +215,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1314) - sess_destroy() did not destroy userdata.
 -  Fixed a bug (#1349) - get_extension() in the :doc:`File Uploading Library ` returned the original filename when it didn't have an actual extension.
 -  Fixed a bug (#1273) - E_NOTICE being generated by :doc:`Query Builder `'s set_update_batch() method.
+-  Fixed a bug (#44, #110) - :doc:`Upload library `'s clean_file_name() method didn't clear '!' and '#' characters.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 55d3ad4faf2727b900832884e7c219076a255b66 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 24 May 2012 22:13:06 +0300
Subject: Fix issue #121

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8ee224fc6..67f1271f1 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -216,6 +216,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1349) - get_extension() in the :doc:`File Uploading Library ` returned the original filename when it didn't have an actual extension.
 -  Fixed a bug (#1273) - E_NOTICE being generated by :doc:`Query Builder `'s set_update_batch() method.
 -  Fixed a bug (#44, #110) - :doc:`Upload library `'s clean_file_name() method didn't clear '!' and '#' characters.
+-  Fixed a bug (#121) - ``CI_DB_result::row()`` returned an array when there's no actual result to be returned.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 846acc7926ccb991d39135353d5047e7de5bcb60 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 24 May 2012 23:27:46 +0300
Subject: Fix issue #319

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 67f1271f1..f21f1266d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -217,6 +217,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1273) - E_NOTICE being generated by :doc:`Query Builder `'s set_update_batch() method.
 -  Fixed a bug (#44, #110) - :doc:`Upload library `'s clean_file_name() method didn't clear '!' and '#' characters.
 -  Fixed a bug (#121) - ``CI_DB_result::row()`` returned an array when there's no actual result to be returned.
+-  Fixed a bug (#319) - SQLSRV's affected_rows() method failed due to a scrollable cursor being created for write-type queries.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From d06acd85cdfff5411474b46afee36fb77baa1200 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 25 May 2012 00:29:09 +0300
Subject: Added update_batch() support for PostgreSQL (issue #356)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f21f1266d..5407fb05e 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -75,6 +75,7 @@ Release Date: Not Released
 	 -  Added db_set_charset() support.
 	 -  Added _optimize_table() support for the :doc:`Database Utility Class ` (rebuilds table indexes).
 	 -  Added boolean data type support in escape().
+	 -  Added update_batch() support.
    -  Added a constructor to the DB_result class and moved all driver-specific properties and logic out of the base DB_driver class to allow better abstraction.
    -  Removed limit() and order_by() support for UPDATE and DELETE queries in PostgreSQL driver. Postgres does not support those features.
    -  Removed protect_identifiers() and renamed internal method _protect_identifiers() to it instead - it was just an alias.
@@ -218,6 +219,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#44, #110) - :doc:`Upload library `'s clean_file_name() method didn't clear '!' and '#' characters.
 -  Fixed a bug (#121) - ``CI_DB_result::row()`` returned an array when there's no actual result to be returned.
 -  Fixed a bug (#319) - SQLSRV's affected_rows() method failed due to a scrollable cursor being created for write-type queries.
+-  Fixed a bug (#356) - PostgreSQL driver didn't have an _update_batch() method, which resulted in fatal error being triggered when update_batch() is used with it.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 21cb2d32edd595a38189cdba137e694c3a22e1f0 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 25 May 2012 01:01:06 +0300
Subject: Fix issue #136 (MySQL escape_like_str())

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5407fb05e..4b8a0f2d3 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -195,7 +195,7 @@ Bug fixes for 3.0
 -  Fixed a bug in the :doc:`Session Library ` where a PHP E_NOTICE error was triggered by _unserialize() due to results from databases such as MSSQL and Oracle being space-padded on the right.
 -  Fixed a bug (#501) - set_rules() to check if the request method is not 'POST' before aborting, instead of depending on count($_POST) in the :doc:`Form Validation Library `.
 -  Fixed a bug (#940) - csrf_verify() used to set the CSRF cookie while processing a POST request with no actual POST data, which resulted in validating a request that should be considered invalid.
--  Fixed a bug in PostgreSQL's escape_str() where it didn't properly escape LIKE wild characters.
+-  Fixed a bug (#136) - PostgreSQL, MySQL and MySQLi's escape_str() method didn't properly escape LIKE wild characters.
 -  Fixed a bug in the library loader where some PHP versions wouldn't execute the class constructor.
 -  Fixed a bug (#88) - An unexisting property was used for configuration of the Memcache cache driver.
 -  Fixed a bug (#14) - create_database() method in the :doc:`Database Forge Library ` didn't utilize the configured database character set.
-- 
cgit v1.2.3-24-g4f1b


From 650f2a2bc15dd575f50446dcc1315c131652ca49 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 26 May 2012 18:56:29 +0300
Subject: Fix issue #862

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4b8a0f2d3..a234d6969 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -220,6 +220,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#121) - ``CI_DB_result::row()`` returned an array when there's no actual result to be returned.
 -  Fixed a bug (#319) - SQLSRV's affected_rows() method failed due to a scrollable cursor being created for write-type queries.
 -  Fixed a bug (#356) - PostgreSQL driver didn't have an _update_batch() method, which resulted in fatal error being triggered when update_batch() is used with it.
+-  Fixed a bug (#862) - create_table() failed on SQLSRV/MSSQL when used with 'IF NOT EXISTS'.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From fa5a9e5f28b2ae61748bb20c2f644c3c156c3d5e Mon Sep 17 00:00:00 2001
From: madhazelnut 
Date: Wed, 30 May 2012 18:50:39 +0300
Subject: create_captcha() helper documentation

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a234d6969..6e528584b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -40,7 +40,7 @@ Release Date: Not Released
    -  Moved error templates to "application/views/errors"
 
 -  Helpers
-
+   -  create_captcha() accepts additional colors parameter, allowing for color customization
    -  url_title() will now trim extra dashes from beginning and end.
    -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
    -  Changed humanize() to include a second param for the separator.
-- 
cgit v1.2.3-24-g4f1b


From 8bbf4e09b68a4aa9beb85edbdb0bec75c7a51de6 Mon Sep 17 00:00:00 2001
From: vlakoff 
Date: Thu, 31 May 2012 13:30:22 +0200
Subject: automatic list formatting was broken

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 6e528584b..da3be3adb 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -40,6 +40,7 @@ Release Date: Not Released
    -  Moved error templates to "application/views/errors"
 
 -  Helpers
+
    -  create_captcha() accepts additional colors parameter, allowing for color customization
    -  url_title() will now trim extra dashes from beginning and end.
    -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
@@ -110,7 +111,7 @@ Release Date: Not Released
    -  :doc:`Cart library ` changes include:
 	 -  It now auto-increments quantity's instead of just resetting it, this is the default behaviour of large e-commerce sites.
 	 -  Product Name strictness can be disabled via the Cart Library by switching "$product_name_safe".
-	 -  Added function remove() to remove a cart item, updating with quantity of 0 seemed like a hack but has remained to retain compatability.
+	 -  Added function remove() to remove a cart item, updating with quantity of 0 seemed like a hack but has remained to retain compatibility.
    -  :doc:`Image Manipulation library ` changes include:
 	 -  The initialize() method now only sets existing class properties.
 	 -  Added support for 3-length hex color values for wm_font_color and wm_shadow_color properties, as well as validation for them.
-- 
cgit v1.2.3-24-g4f1b


From 991cfa2e5843df05c6295445133882b9f35e3f7b Mon Sep 17 00:00:00 2001
From: Thanasis Polychronakis 
Date: Thu, 31 May 2012 21:54:35 +0300
Subject: Changed documentation and added note to changelog as per
 @philsturgeon request

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index da3be3adb..3989b52d2 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -38,6 +38,7 @@ Release Date: Not Released
    -  Added some more doctypes.
    -  Updated all classes to be written in PHP 5 style, with visibility declarations and no ``var`` usage for properties.
    -  Moved error templates to "application/views/errors"
+   -  Global config files are loaded first, then environment ones. Environment config keys overwrite base ones, allowing to only set the keys we want changed per Env.
 
 -  Helpers
 
-- 
cgit v1.2.3-24-g4f1b


From 2e757d844caede9784da0b30faa7d5c405c6b172 Mon Sep 17 00:00:00 2001
From: Mickey Wu 
Date: Fri, 1 Jun 2012 10:24:22 -0700
Subject: Update user_guide_src/source/changelog.rst

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index da3be3adb..13482d826 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -132,6 +132,7 @@ Release Date: Not Released
    -  Allowed for setting table class defaults in a config file.
    -  Added a Wincache driver to the :doc:`Caching Library `.
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
+   -  Enabled public access to Email library's set_header() for adding additional headers to e-mails.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From dda21f6abc76451997b12c07e6066aa49c2d423d Mon Sep 17 00:00:00 2001
From: Phil Sturgeon 
Date: Sun, 3 Jun 2012 10:36:36 -0500
Subject: Added support for $_SERVER['CI_ENV'] in index.php Remember this is
 entirely optional, nothing will change if you do not which to use Multiple
 Environments just like right now. If you DO set CI_ENV you can manipulate the
 switch that controls error reporting, etc, so set it to "production" on your
 live site to hide errors from users. If you don't require this logic you can
 remove it, or change it entirely to check HTTP_HOST for environment
 subdomains, or check IP address, etc.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a234d6969..5e09f8c29 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -19,6 +19,7 @@ Release Date: Not Released
 -  General Changes
 
    -  PHP 5.1.6 is no longer supported. CodeIgniter now requires PHP 5.2.4.
+   -  ``$_SERVER['CI_ENV']`` can now be set to control the ``ENVIRONMENT`` constant.
    -  Added an optional backtrace to php-error template.
    -  Added Android to the list of user agents.
    -  Added Windows 7, Android, Blackberry and iOS to the list of user platforms.
-- 
cgit v1.2.3-24-g4f1b


From 2fd0506ebcfeeadc0a07c4667d1997d0d30b205e Mon Sep 17 00:00:00 2001
From: Michiel Vugteveen 
Date: Mon, 4 Jun 2012 20:49:03 +0200
Subject: changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3989b52d2..c8c2ef010 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -223,6 +223,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#319) - SQLSRV's affected_rows() method failed due to a scrollable cursor being created for write-type queries.
 -  Fixed a bug (#356) - PostgreSQL driver didn't have an _update_batch() method, which resulted in fatal error being triggered when update_batch() is used with it.
 -  Fixed a bug (#862) - create_table() failed on SQLSRV/MSSQL when used with 'IF NOT EXISTS'.
+-  Fixed a bug (#1419) - libraries/Driver.php had a static variable that was causing an error.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 6ef498b49946ba74d610b3805fb908b163a7f03a Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 5 Jun 2012 22:01:58 +0300
Subject: Added get_mimes() function to system/core/Commons.php.The MIMEs array
 from config/mimes.php is used by multiple core classes, libraries and helpers
 and each of them has implemented an own way of getting it, which is not
 needed and is hard to maintain. This also fixes issue #1411

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 587e56ea7..8ecdf9aef 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -147,6 +147,7 @@ Release Date: Not Released
    -  Added support for HTTP-Only cookies with new config option ``cookie_httponly`` (default FALSE).
    -  Renamed method _call_hook() to call_hook() in the :doc:`Hooks Library `.
    -  Added get_content_type() method to the :doc:`Output Library `.
+   -  Added get_mimes() function to system/core/Commons.php to return the config/mimes.php array.
 
 Bug fixes for 3.0
 ------------------
@@ -225,6 +226,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#356) - PostgreSQL driver didn't have an _update_batch() method, which resulted in fatal error being triggered when update_batch() is used with it.
 -  Fixed a bug (#862) - create_table() failed on SQLSRV/MSSQL when used with 'IF NOT EXISTS'.
 -  Fixed a bug (#1419) - libraries/Driver.php had a static variable that was causing an error.
+-  Fixed a bug (#1411) - the :doc:`Email library ` used its own short list of MIMEs instead the one from config/mimes.php.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 24bd230337cc469941dbdb51e05351cc1b3fbe14 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 5 Jun 2012 22:29:12 +0300
Subject: Fix a magic_quotes-related bug and changed the default parameter
 value for is_php()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8ecdf9aef..c4c42d118 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -227,6 +227,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#862) - create_table() failed on SQLSRV/MSSQL when used with 'IF NOT EXISTS'.
 -  Fixed a bug (#1419) - libraries/Driver.php had a static variable that was causing an error.
 -  Fixed a bug (#1411) - the :doc:`Email library ` used its own short list of MIMEs instead the one from config/mimes.php.
+-  Fixed a bug where the magic_quotes_runtime setting wasn't turned off for PHP 5.3 (where it is indeed deprecated, but not non-existent).
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From aa31f05646f177e587e1e4a0b74cb351bd98de84 Mon Sep 17 00:00:00 2001
From: Mickey Wu 
Date: Tue, 5 Jun 2012 16:55:04 -0700
Subject: Update develop

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 13482d826..a0cff6e22 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -132,7 +132,7 @@ Release Date: Not Released
    -  Allowed for setting table class defaults in a config file.
    -  Added a Wincache driver to the :doc:`Caching Library `.
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
-   -  Enabled public access to Email library's set_header() for adding additional headers to e-mails.
+   -  Enabled public access to Email library's set_header() for adding additional headers to e-mails. Original function _set_header() now renamed to set_header().
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From d4901395c598552a3ef52d34aa3734e7b124dbfa Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 6 Jun 2012 14:54:15 +0300
Subject: Added Fennec as Firefox Mobile to config/user_agents.php (issue
 #1063)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f4bba25ed..74de512f7 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -23,6 +23,7 @@ Release Date: Not Released
    -  Added an optional backtrace to php-error template.
    -  Added Android to the list of user agents.
    -  Added Windows 7, Android, Blackberry and iOS to the list of user platforms.
+   -  Added Fennec (Firefox for mobile) to the list of mobile user agents.
    -  Ability to log certain error types, not all under a threshold.
    -  Added support for pem, p10, p12, p7a, p7c, p7m, p7r, p7s, crt, crl, der, kdb, rsa, cer, sst, csr Certs to mimes.php.
    -  Added support for pgp and gpg to mimes.php.
@@ -79,8 +80,8 @@ Release Date: Not Released
 	 -  Added _optimize_table() support for the :doc:`Database Utility Class ` (rebuilds table indexes).
 	 -  Added boolean data type support in escape().
 	 -  Added update_batch() support.
+	 -  Removed limit() and order_by() support for UPDATE and DELETE queries in as PostgreSQL does not support those features.
    -  Added a constructor to the DB_result class and moved all driver-specific properties and logic out of the base DB_driver class to allow better abstraction.
-   -  Removed limit() and order_by() support for UPDATE and DELETE queries in PostgreSQL driver. Postgres does not support those features.
    -  Removed protect_identifiers() and renamed internal method _protect_identifiers() to it instead - it was just an alias.
    -  MySQL and MySQLi drivers now require at least MySQL version 5.1.
    -  db_set_charset() now only requires one parameter (collation was only needed due to legacy support for MySQL versions prior to 5.1).
-- 
cgit v1.2.3-24-g4f1b


From 73ed3ed3e2cf3efeb8332c569e589f16468daf7d Mon Sep 17 00:00:00 2001
From: Joffrey Jaffeux 
Date: Wed, 6 Jun 2012 14:26:55 +0200
Subject: update changelog for ipv6 support

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f4bba25ed..c12db1f27 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -135,6 +135,7 @@ Release Date: Not Released
    -  Added a Wincache driver to the :doc:`Caching Library `.
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
    -  Enabled public access to Email library's set_header() for adding additional headers to e-mails. Original function _set_header() now renamed to set_header().
+   - Input library now supports IPv6 and has a ip_version() method.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 6c8515459e4c631b0882532e8c44ee6435fd3809 Mon Sep 17 00:00:00 2001
From: Joffrey Jaffeux 
Date: Wed, 6 Jun 2012 14:30:11 +0200
Subject: bad spacing

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c12db1f27..0ab18782e 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -135,7 +135,7 @@ Release Date: Not Released
    -  Added a Wincache driver to the :doc:`Caching Library `.
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
    -  Enabled public access to Email library's set_header() for adding additional headers to e-mails. Original function _set_header() now renamed to set_header().
-   - Input library now supports IPv6 and has a ip_version() method.
+   -  Input library now supports IPv6 and has a ip_version() method.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 47b673324f06236264ca64f8c3155aab51762609 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 6 Jun 2012 15:58:05 +0300
Subject: Add a second parameter (charset) to CI_Output::set_content_type() +
 fix for issue #666

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 74de512f7..ce9b06883 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -135,7 +135,7 @@ Release Date: Not Released
    -  Allowed for setting table class defaults in a config file.
    -  Added a Wincache driver to the :doc:`Caching Library `.
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
-   -  Enabled public access to Email library's set_header() for adding additional headers to e-mails. Original function _set_header() now renamed to set_header().
+   -  Renamed method _set_header() to set_header() and made it public to enable adding custom headers in the :doc:`Email Library `.
 
 -  Core
 
@@ -150,6 +150,7 @@ Release Date: Not Released
    -  Renamed method _call_hook() to call_hook() in the :doc:`Hooks Library `.
    -  Added get_content_type() method to the :doc:`Output Library `.
    -  Added get_mimes() function to system/core/Commons.php to return the config/mimes.php array.
+   -  Added a second argument to set_content_type() in the :doc:`Output Library ` that allows setting the document charset as well.
 
 Bug fixes for 3.0
 ------------------
@@ -230,6 +231,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1419) - libraries/Driver.php had a static variable that was causing an error.
 -  Fixed a bug (#1411) - the :doc:`Email library ` used its own short list of MIMEs instead the one from config/mimes.php.
 -  Fixed a bug where the magic_quotes_runtime setting wasn't turned off for PHP 5.3 (where it is indeed deprecated, but not non-existent).
+-  Fixed a bug (#666) - :doc:`Output library `'s set_content_type() method didn't set the document charset.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 3c5623748424aaccd6bad980240833b3b1e87d60 Mon Sep 17 00:00:00 2001
From: Cory 
Date: Wed, 6 Jun 2012 10:51:55 -0400
Subject: Modifying changelog to reflect the change

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 587e56ea7..e8e8a8da0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -225,6 +225,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#356) - PostgreSQL driver didn't have an _update_batch() method, which resulted in fatal error being triggered when update_batch() is used with it.
 -  Fixed a bug (#862) - create_table() failed on SQLSRV/MSSQL when used with 'IF NOT EXISTS'.
 -  Fixed a bug (#1419) - libraries/Driver.php had a static variable that was causing an error.
+-  Fixed a bug (#1374) - :doc:`Table Library ` was generating an extra td tag at the start of the tr.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 1ab6f6520ebfc016c49cfbe3a4d9d009be5da268 Mon Sep 17 00:00:00 2001
From: Joffrey Jaffeux 
Date: Wed, 6 Jun 2012 20:14:13 +0200
Subject: removed ip_version()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3118b7dc5..0b987b1be 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -135,7 +135,7 @@ Release Date: Not Released
    -  Allowed for setting table class defaults in a config file.
    -  Added a Wincache driver to the :doc:`Caching Library `.
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
-   -  Input library now supports IPv6 and has a ip_version() method.
+   -  Input library now supports IPv6.
    -  Renamed method _set_header() to set_header() and made it public to enable adding custom headers in the :doc:`Email Library `.
 
 -  Core
-- 
cgit v1.2.3-24-g4f1b


From 0f0b76980cb07f39b20c8591882aeae3854f016c Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 7 Jun 2012 14:57:04 +0300
Subject: Deprecated do_hash() and read_file() in favor of hash() and
 file_get_contents() respectively

---
 user_guide_src/source/changelog.rst | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 211e9acc9..7180c2d07 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -44,19 +44,21 @@ Release Date: Not Released
 
 -  Helpers
 
-   -  create_captcha() accepts additional colors parameter, allowing for color customization
-   -  url_title() will now trim extra dashes from beginning and end.
+   -  ``create_captcha()`` accepts additional colors parameter, allowing for color customization.
+   -  ``url_title()`` will now trim extra dashes from beginning and end.
    -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
-   -  Changed humanize() to include a second param for the separator.
+   -  Changed ``humanize()`` to include a second param for the separator.
    -  Refactored ``plural()`` and ``singular()`` to avoid double pluralization and support more words.
    -  Added an optional third parameter to ``force_download()`` that enables/disables sending the actual file MIME type in the Content-Type header (disabled by default).
    -  Added an optional third parameter to ``timespan()`` that constrains the number of time units displayed.
-   -  Added a work-around in force_download() for a bug Android <= 2.1, where the filename extension needs to be in uppercase.
-   -  form_dropdown() will now also take an array for unity with other form helpers.
-   -  set_realpath() can now also handle file paths as opposed to just directories.
-   -  do_hash() now uses PHP's native hash() function, supporting more algorithms.
-   -  Added an optional paramater to ``delete_files()`` to enable it to skip deleting files such as .htaccess and index.html.
-   -  Removed deprecated helper function ``js_insert_smiley()`` from smiley helper.
+   -  Added a work-around in ``force_download()`` for a bug Android <= 2.1, where the filename extension needs to be in uppercase.
+   -  ``form_dropdown()`` will now also take an array for unity with other form helpers.
+   -  ``do_hash()`` now uses PHP's native ``hash()`` function (supporting more algorithms) and is deprecated.
+   -  Removed previously deprecated helper function ``js_insert_smiley()`` from smiley helper.
+   -  :doc:`File Helper ` changes include:
+	 - ``set_realpath()`` can now also handle file paths as opposed to just directories.
+	 - Added an optional paramater to ``delete_files()`` to enable it to skip deleting files such as .htaccess and index.html.
+	 - ``read_file()`` is now a deprecated alias of ``file_get_contents()``.
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From d09ff35e8c4b7cae6313cc40ec0e6b57b9f52106 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 7 Jun 2012 15:46:32 +0300
Subject: Revert 296ab9a06e3c648de56861ad67581236a6dae71a - there's no bug to
 fix

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 7180c2d07..a7bf6fa6e 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -235,7 +235,6 @@ Bug fixes for 3.0
 -  Fixed a bug (#1411) - the :doc:`Email library ` used its own short list of MIMEs instead the one from config/mimes.php.
 -  Fixed a bug where the magic_quotes_runtime setting wasn't turned off for PHP 5.3 (where it is indeed deprecated, but not non-existent).
 -  Fixed a bug (#666) - :doc:`Output library `'s set_content_type() method didn't set the document charset.
--  Fixed a bug (#1374) - :doc:`Table Library ` was generating an extra td tag at the start of the tr.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 1f26edc61f314a74cd93fcdf688b3780734e0e96 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 7 Jun 2012 16:13:54 +0300
Subject: Added a work-around for MSSQL/SQLSRV create_table() with INT column
 types (column lengths are not supported)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index a7bf6fa6e..942a52cdf 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -172,7 +172,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#797) - timespan() was using incorrect seconds for year and month.
 -  Fixed a bug in CI_Cart::contents() where if called without a TRUE (or equal) parameter, it would fail due to a typo.
 -  Fixed a bug (#696) - make oci_execute() calls inside num_rows() non-committing, since they are only there to reset which row is next in line for oci_fetch calls and thus don't need to be committed.
--  Fixed a bug (#406) - sqlsrv DB driver not returning resource on ``db_pconnect()``.
+-  Fixed a bug (#406) - SQLSRV DB driver not returning resource on ``db_pconnect()``.
 -  Fixed a bug in CI_Image_lib::gd_loaded() where it was possible for the script execution to end or a PHP E_WARNING message to be emitted.
 -  Fixed a bug in the :doc:`Pagination library ` where when use_page_numbers=TRUE previous link and page 1 link did not have the same url.
 -  Fixed a bug (#561) - Errors in :doc:`XML-RPC Library ` were not properly escaped.
@@ -230,7 +230,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#121) - ``CI_DB_result::row()`` returned an array when there's no actual result to be returned.
 -  Fixed a bug (#319) - SQLSRV's affected_rows() method failed due to a scrollable cursor being created for write-type queries.
 -  Fixed a bug (#356) - PostgreSQL driver didn't have an _update_batch() method, which resulted in fatal error being triggered when update_batch() is used with it.
--  Fixed a bug (#862) - create_table() failed on SQLSRV/MSSQL when used with 'IF NOT EXISTS'.
+-  Fixed a bug (#784, #862) - create_table() failed on SQLSRV/MSSQL when used with 'IF NOT EXISTS'.
 -  Fixed a bug (#1419) - libraries/Driver.php had a static variable that was causing an error.
 -  Fixed a bug (#1411) - the :doc:`Email library ` used its own short list of MIMEs instead the one from config/mimes.php.
 -  Fixed a bug where the magic_quotes_runtime setting wasn't turned off for PHP 5.3 (where it is indeed deprecated, but not non-existent).
-- 
cgit v1.2.3-24-g4f1b


From af4d55da04b8d8750b59e04e46463d525237b74b Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 7 Jun 2012 16:22:35 +0300
Subject: Fix issue #861 (and previous commit, for that matter)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 942a52cdf..801f0e481 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -230,11 +230,12 @@ Bug fixes for 3.0
 -  Fixed a bug (#121) - ``CI_DB_result::row()`` returned an array when there's no actual result to be returned.
 -  Fixed a bug (#319) - SQLSRV's affected_rows() method failed due to a scrollable cursor being created for write-type queries.
 -  Fixed a bug (#356) - PostgreSQL driver didn't have an _update_batch() method, which resulted in fatal error being triggered when update_batch() is used with it.
--  Fixed a bug (#784, #862) - create_table() failed on SQLSRV/MSSQL when used with 'IF NOT EXISTS'.
+-  Fixed a bug (#784, #862) - :doc:`Database Forge ` method ``create_table()`` failed on SQLSRV/MSSQL when used with 'IF NOT EXISTS'.
 -  Fixed a bug (#1419) - libraries/Driver.php had a static variable that was causing an error.
 -  Fixed a bug (#1411) - the :doc:`Email library ` used its own short list of MIMEs instead the one from config/mimes.php.
 -  Fixed a bug where the magic_quotes_runtime setting wasn't turned off for PHP 5.3 (where it is indeed deprecated, but not non-existent).
 -  Fixed a bug (#666) - :doc:`Output library `'s set_content_type() method didn't set the document charset.
+-  Fixed a bug (#784, #861) - :doc:`Database Forge ` method ``create_table()`` used to accept constraints for MSSQL/SQLSRV integer-type columns.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From c2c361b9c9dcfd94003d97622d74184f01c0615f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 7 Jun 2012 22:06:51 +0300
Subject: Add a changelog note

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 801f0e481..66da20c40 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -106,6 +106,7 @@ Release Date: Not Released
    -  Added MSSQL, SQLSRV support for optimize_table() in :doc:`Database Utility `.
    -  Improved CUBRID support for list_databases() in :doc:`Database Utility ` (until now only the currently used database was returned).
    -  Added unbuffered_row() method for getting a row without prefetching whole result (consume less memory).
+   -  Added port handling support for MSSQL on UNIX-based systems.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From b2457b7958d7f342507a2516198c87d8fb1d8f76 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 7 Jun 2012 23:36:56 +0300
Subject: Add ics files support to mimes.php (issue #1441)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 66da20c40..256de9548 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -30,9 +30,10 @@ Release Date: Not Released
    -  Added support for 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
    -  Added support for m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
    -  Added support for kmz and kml (Google Earth) files to mimes.php.
-   -  Added Romanian and Greek characters in foreign_characters.php
+   -  Added support for ics Calendar files to mimes.php
+   -  Updated support for xml ('application/xml') and xsl ('application/xml', 'text/xsl') files in mimes.php.
    -  Updated support for doc files in mimes.php.
-   -  Added application/xml for xml and application/xml, text/xsl for xsl in mimes.php.
+   -  Added Romanian and Greek characters in foreign_characters.php.
    -  Changed logger to only chmod when file is first created.
    -  Removed previously deprecated SHA1 Library.
    -  Removed previously deprecated use of ``$autoload['core']`` in application/config/autoload.php.
-- 
cgit v1.2.3-24-g4f1b


From 082ee2b054b0d61ac02fea3deb704290e8d6021a Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 8 Jun 2012 15:26:34 +0300
Subject: Added MSSQL/SQLSRV field escaping support with QUOTE_IDENTIFIER
 detection (issue #706)

---
 user_guide_src/source/changelog.rst | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 256de9548..7a6f8fa37 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -88,10 +88,16 @@ Release Date: Not Released
    -  Removed protect_identifiers() and renamed internal method _protect_identifiers() to it instead - it was just an alias.
    -  MySQL and MySQLi drivers now require at least MySQL version 5.1.
    -  db_set_charset() now only requires one parameter (collation was only needed due to legacy support for MySQL versions prior to 5.1).
-   -  Added DSN string support for CUBRID.
-   -  Added persistent connections support for CUBRID.
-   -  Added random ordering support for MSSQL, SQLSRV.
    -  Added support for SQLite3 database driver.
+   -  Improved support of the CUBRID driver, including:
+	 - Added DSN string support.
+	 - Added persistent connections support.
+	 - Improved list_databases() in :doc:`Database Utility ` (until now only the currently used database was returned).
+   -  Improved support of the MSSQL and SQLSRV drivers, including:
+	 - Added random ordering support.
+	 - Added support for optimize_table() in :doc:`Database Utility `.
+	 - Added escaping with QUOTE_IDENTIFIER setting detection.
+	 - Added port handling support for UNIX-based systems (MSSQL driver).
    -  Improved support of the Oracle (OCI8) driver, including:
 	 -  Added DSN string support (Easy Connect and TNS).
 	 -  Added support for dropping tables to :doc:`Database Forge `.
@@ -104,10 +110,7 @@ Release Date: Not Released
    -  Added SQLite support for drop_table() in :doc:`Database Forge `.
    -  Added ODBC support for create_database(), drop_database() and drop_table() in :doc:`Database Forge `.
    -  Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge `.
-   -  Added MSSQL, SQLSRV support for optimize_table() in :doc:`Database Utility `.
-   -  Improved CUBRID support for list_databases() in :doc:`Database Utility ` (until now only the currently used database was returned).
    -  Added unbuffered_row() method for getting a row without prefetching whole result (consume less memory).
-   -  Added port handling support for MSSQL on UNIX-based systems.
 
 -  Libraries
 
@@ -238,6 +241,7 @@ Bug fixes for 3.0
 -  Fixed a bug where the magic_quotes_runtime setting wasn't turned off for PHP 5.3 (where it is indeed deprecated, but not non-existent).
 -  Fixed a bug (#666) - :doc:`Output library `'s set_content_type() method didn't set the document charset.
 -  Fixed a bug (#784, #861) - :doc:`Database Forge ` method ``create_table()`` used to accept constraints for MSSQL/SQLSRV integer-type columns.
+-  Fixed a bug (#706) - SQLSRV/MSSSQL didn't escape field names.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 9637b40ca9e9ac1cdce2b895d3db09848a6eef76 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 8 Jun 2012 15:39:24 +0300
Subject: escape_identifiers() to accept arrays as well

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 7a6f8fa37..0880247fc 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -107,6 +107,7 @@ Release Date: Not Released
 	 -  num_rows() is now only called explicitly by the developer and no longer re-executes statements.
    -  Added replace() support for SQLite.
    -  Renamed internal method _escape_identifiers() to escape_identifiers().
+   -  Updated escape_identifiers() to accept an array of fields as well as strings.
    -  Added SQLite support for drop_table() in :doc:`Database Forge `.
    -  Added ODBC support for create_database(), drop_database() and drop_table() in :doc:`Database Forge `.
    -  Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge `.
-- 
cgit v1.2.3-24-g4f1b


From d25c589dc3bbfc83fb59bbeb1a3046b99bf694f8 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 8 Jun 2012 16:23:01 +0300
Subject: Add OFFSET support for SQL Server 2012

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 0880247fc..25b42b2e0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -98,6 +98,7 @@ Release Date: Not Released
 	 - Added support for optimize_table() in :doc:`Database Utility `.
 	 - Added escaping with QUOTE_IDENTIFIER setting detection.
 	 - Added port handling support for UNIX-based systems (MSSQL driver).
+	 - Added OFFSET support for SQL Server 2012 and above.
    -  Improved support of the Oracle (OCI8) driver, including:
 	 -  Added DSN string support (Easy Connect and TNS).
 	 -  Added support for dropping tables to :doc:`Database Forge `.
-- 
cgit v1.2.3-24-g4f1b


From 9e674f74ec4f36f11f30e2f84a48ef6cea33a9d9 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 9 Jun 2012 21:02:52 +0300
Subject: Cleanup the new Redis cache driver and add a changelog entry for it

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 25b42b2e0..17b360b62 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -143,6 +143,7 @@ Release Date: Not Released
    -  Added all_flashdata() method to session class. Returns an associative array of only flashdata.
    -  Allowed for setting table class defaults in a config file.
    -  Added a Wincache driver to the :doc:`Caching Library `.
+   -  Added a Redis driver to the :doc:`Caching Library `.
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
    -  Input library now supports IPv6.
    -  Renamed method _set_header() to set_header() and made it public to enable adding custom headers in the :doc:`Email Library `.
-- 
cgit v1.2.3-24-g4f1b


From 5a257187c4ca09ea61c19999bf061cec3f224cc2 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sun, 10 Jun 2012 06:18:14 +0300
Subject: Merge branch 2.1-stable into develop

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 17b360b62..70d622b4b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -145,7 +145,6 @@ Release Date: Not Released
    -  Added a Wincache driver to the :doc:`Caching Library `.
    -  Added a Redis driver to the :doc:`Caching Library `.
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
-   -  Input library now supports IPv6.
    -  Renamed method _set_header() to set_header() and made it public to enable adding custom headers in the :doc:`Email Library `.
 
 -  Core
@@ -256,6 +255,8 @@ Release Date: Not Released
 
 -  Libraries
    -  Further improved MIME type detection in the :doc:`File Uploading Library `.
+   -  Added support for IPv6 to the :doc:`Input Library `.
+   -  Added support for the IP format parameter to the :doc:`Form Validation Library `.
 
 -  Helpers
    -  url_title() performance and output improved. You can now use any string as the word delimiter, but 'dash' and 'underscore' are still supported.
@@ -270,6 +271,9 @@ Bug fixes for 2.1.1
 -  Fixed a bug - When database caching was enabled, $this->db->query() checked the cache before binding variables which resulted in cached queries never being found.
 -  Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.
 -  Fixed a bug (#726) - PDO put a 'dbname' argument in it's connection string regardless of the database platform in use, which made it impossible to use SQLite.
+-  Fixed a bug - CI_DB_pdo_driver::num_rows() was not returning properly value with SELECT queries, cause it was relying on PDOStatement::rowCount().
+-  Fixed a bug (#1059) - CI_Image_lib::clear() was not correctly clearing all necessary object properties, namely width and height.
+-  Fixed a bud (#1387) - Active Record's ``from()`` method didn't escape table aliases.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From bf94058d537efc78ed2df7009db8b3261ff44619 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sun, 10 Jun 2012 07:05:05 +0300
Subject: Fix issue #1452

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 70d622b4b..5b2f59e7e 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -244,6 +244,8 @@ Bug fixes for 3.0
 -  Fixed a bug (#666) - :doc:`Output library `'s set_content_type() method didn't set the document charset.
 -  Fixed a bug (#784, #861) - :doc:`Database Forge ` method ``create_table()`` used to accept constraints for MSSQL/SQLSRV integer-type columns.
 -  Fixed a bug (#706) - SQLSRV/MSSSQL didn't escape field names.
+-  Fixed a bug (#1452) - protect_identifiers() didn't properly detect identifiers with spaces in their names.
+-  Fixed a bug where protect_identifiers() ignored it's extra arguments when the value passed to it is an array.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From d454f0e413ba6df6494b6c0da4d32fac8a17de1c Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sun, 10 Jun 2012 14:51:04 +0300
Subject: Add BETWEEN to _has_operator()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5b2f59e7e..027163db7 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -246,6 +246,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#706) - SQLSRV/MSSSQL didn't escape field names.
 -  Fixed a bug (#1452) - protect_identifiers() didn't properly detect identifiers with spaces in their names.
 -  Fixed a bug where protect_identifiers() ignored it's extra arguments when the value passed to it is an array.
+-  Fixed a bug where _has_operator() didn't detect BETWEEN.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 37ec30c6d89448cd11c24788c01ff06326de128b Mon Sep 17 00:00:00 2001
From: Michiel Vugteveen 
Date: Mon, 11 Jun 2012 09:26:33 +0200
Subject: changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 027163db7..984183a13 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -146,6 +146,7 @@ Release Date: Not Released
    -  Added a Redis driver to the :doc:`Caching Library `.
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
    -  Renamed method _set_header() to set_header() and made it public to enable adding custom headers in the :doc:`Email Library `.
+   -  Added a index parameter to the data() function in the Upload library.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 650b4c000242ad90ed1ca1e56bdee7d42dbdedaa Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 11 Jun 2012 12:07:15 +0300
Subject: Remove unused qb_order property + other minor changes

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 984183a13..259f4e732 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -146,7 +146,7 @@ Release Date: Not Released
    -  Added a Redis driver to the :doc:`Caching Library `.
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
    -  Renamed method _set_header() to set_header() and made it public to enable adding custom headers in the :doc:`Email Library `.
-   -  Added a index parameter to the data() function in the Upload library.
+   -  Added an "index" parameter to the data() method in the :doc:`Upload library `.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 71379ca89226fe8af0314a8b70e5dc0f57367255 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 11 Jun 2012 16:12:43 +0300
Subject: Add OFFSET support for SQL Server 2005+ in MSSQL/SQLSRV

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 259f4e732..03b541e3d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -98,7 +98,7 @@ Release Date: Not Released
 	 - Added support for optimize_table() in :doc:`Database Utility `.
 	 - Added escaping with QUOTE_IDENTIFIER setting detection.
 	 - Added port handling support for UNIX-based systems (MSSQL driver).
-	 - Added OFFSET support for SQL Server 2012 and above.
+	 - Added OFFSET support for SQL Server 2005 and above.
    -  Improved support of the Oracle (OCI8) driver, including:
 	 -  Added DSN string support (Easy Connect and TNS).
 	 -  Added support for dropping tables to :doc:`Database Forge `.
-- 
cgit v1.2.3-24-g4f1b


From e6302791d229e42c8fc42a3982a10eb63508197f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 11 Jun 2012 21:28:22 +0300
Subject: Fix a join() issue

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 03b541e3d..5627f0221 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -248,6 +248,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1452) - protect_identifiers() didn't properly detect identifiers with spaces in their names.
 -  Fixed a bug where protect_identifiers() ignored it's extra arguments when the value passed to it is an array.
 -  Fixed a bug where _has_operator() didn't detect BETWEEN.
+-  Fixed a bug where :doc:`Query Builder `'s join failed with identifiers containing dashes.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 5d28176a76355b230f1c4e1858475def4e34fa4c Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 11 Jun 2012 22:05:40 +0300
Subject: Fix issue #1264

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5627f0221..fb137e460 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -249,6 +249,7 @@ Bug fixes for 3.0
 -  Fixed a bug where protect_identifiers() ignored it's extra arguments when the value passed to it is an array.
 -  Fixed a bug where _has_operator() didn't detect BETWEEN.
 -  Fixed a bug where :doc:`Query Builder `'s join failed with identifiers containing dashes.
+-  Fixed a bug (#1264) - :doc:`Database Forge ` and :doc:`Database Utilities ` didn't update/reset the databases and tables list cache when a table or a database is created, dropped or renamed.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 428702387ca071db4686ec6d6c60bd35b01c33e4 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 12 Jun 2012 01:30:20 +0300
Subject: join() with multiple conditions and optional escape parameter

---
 user_guide_src/source/changelog.rst | 50 ++++++++++++++++++++-----------------
 1 file changed, 27 insertions(+), 23 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index fb137e460..2c76ea43f 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -63,14 +63,17 @@ Release Date: Not Released
 
 -  Database
 
-   -  Renamed the Active Record class to Query Builder to remove confusion with the Active Record design pattern.
-   -  Added the ability to insert objects with insert_batch() in :doc:`Query Builder `.
-   -  Added new :doc:`Query Builder ` methods that return the SQL string of queries without executing them: get_compiled_select(), get_compiled_insert(), get_compiled_update(), get_compiled_delete().
-   -  Adding $escape parameter to the order_by() method, this enables ordering by custom fields.
+   -  :doc:`Query Builder ` changes include:
+	 - Renamed the Active Record class to Query Builder to remove confusion with the Active Record design pattern.
+	 - Added the ability to insert objects with insert_batch().
+	 - Added new methods that return the SQL string of queries without executing them: get_compiled_select(), get_compiled_insert(), get_compiled_update(), get_compiled_delete().
+	 - Added an optional order_by() parameter that allows to disable escaping (useful for custom fields).
+	 - Added an optional join() parameter that allows to disable escaping.
+	 - Added support for join() with multiple conditions.
    -  Improved support for the MySQLi driver, including:
-	 -  OOP style of the PHP extension is now used, instead of the procedural aliases.
-	 -  Server version checking is now done via ``mysqli::$server_info`` instead of running an SQL query.
-	 -  Added persistent connections support for PHP >= 5.3.
+	 - OOP style of the PHP extension is now used, instead of the procedural aliases.
+	 - Server version checking is now done via ``mysqli::$server_info`` instead of running an SQL query.
+	 - Added persistent connections support for PHP >= 5.3.
    -  Added 'dsn' configuration setting for drivers that support DSN strings (PDO, PostgreSQL, Oracle, ODBC, CUBRID).
    -  Improved PDO database support.
    -  Added Interbase/Firebird database support via the "interbase" driver.
@@ -78,14 +81,16 @@ Release Date: Not Released
    -  Replaced the _error_message() and _error_number() methods with error(), that returns an array containing the last database error code and message.
    -  Improved version() implementation so that drivers that have a native function to get the version number don't have to be defined in the core DB_driver class.
    -  Improved support of the PostgreSQL driver, including:
-	 -  pg_version() is now used to get the database version number, when possible.
-	 -  Added db_set_charset() support.
-	 -  Added _optimize_table() support for the :doc:`Database Utility Class ` (rebuilds table indexes).
-	 -  Added boolean data type support in escape().
-	 -  Added update_batch() support.
-	 -  Removed limit() and order_by() support for UPDATE and DELETE queries in as PostgreSQL does not support those features.
+	 - pg_version() is now used to get the database version number, when possible.
+	 - Added db_set_charset() support.
+	 - Added _optimize_table() support for the :doc:`Database Utility Class ` (rebuilds table indexes).
+	 - Added boolean data type support in escape().
+	 - Added update_batch() support.
+	 - Removed limit() and order_by() support for UPDATE and DELETE queries in as PostgreSQL does not support those features.
    -  Added a constructor to the DB_result class and moved all driver-specific properties and logic out of the base DB_driver class to allow better abstraction.
    -  Removed protect_identifiers() and renamed internal method _protect_identifiers() to it instead - it was just an alias.
+   -  Renamed internal method _escape_identifiers() to escape_identifiers().
+   -  Updated escape_identifiers() to accept an array of fields as well as strings.
    -  MySQL and MySQLi drivers now require at least MySQL version 5.1.
    -  db_set_charset() now only requires one parameter (collation was only needed due to legacy support for MySQL versions prior to 5.1).
    -  Added support for SQLite3 database driver.
@@ -100,16 +105,15 @@ Release Date: Not Released
 	 - Added port handling support for UNIX-based systems (MSSQL driver).
 	 - Added OFFSET support for SQL Server 2005 and above.
    -  Improved support of the Oracle (OCI8) driver, including:
-	 -  Added DSN string support (Easy Connect and TNS).
-	 -  Added support for dropping tables to :doc:`Database Forge `.
-	 -  Added support for listing database schemas to :doc:`Database Utilities `.
-	 -  Generally improved for speed and cleaned up all of its components.
-	 -  *Row* result methods now really only fetch only the needed number of rows, instead of depending entirely on result().
-	 -  num_rows() is now only called explicitly by the developer and no longer re-executes statements.
-   -  Added replace() support for SQLite.
-   -  Renamed internal method _escape_identifiers() to escape_identifiers().
-   -  Updated escape_identifiers() to accept an array of fields as well as strings.
-   -  Added SQLite support for drop_table() in :doc:`Database Forge `.
+	 - Added DSN string support (Easy Connect and TNS).
+	 - Added support for drop_table() in :doc:`Database Forge `.
+	 - Added support for list_databases() in :doc:`Database Utilities `.
+	 - Generally improved for speed and cleaned up all of its components.
+	 - *Row* result methods now really only fetch only the needed number of rows, instead of depending entirely on result().
+	 - num_rows() is now only called explicitly by the developer and no longer re-executes statements.
+   -  Improved support of the Sqlite driver, including:
+	 - Added support for replace() in :doc:`Query Builder `.
+	 - Added support for drop_table() in :doc:`Database Forge `.
    -  Added ODBC support for create_database(), drop_database() and drop_table() in :doc:`Database Forge `.
    -  Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge `.
    -  Added unbuffered_row() method for getting a row without prefetching whole result (consume less memory).
-- 
cgit v1.2.3-24-g4f1b


From c73df1de471d4dc849942e718e17d97a04c6fd20 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 12 Jun 2012 01:43:03 +0300
Subject: Add changelog entry for issue #7

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 2c76ea43f..6d2971103 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -252,8 +252,9 @@ Bug fixes for 3.0
 -  Fixed a bug (#1452) - protect_identifiers() didn't properly detect identifiers with spaces in their names.
 -  Fixed a bug where protect_identifiers() ignored it's extra arguments when the value passed to it is an array.
 -  Fixed a bug where _has_operator() didn't detect BETWEEN.
--  Fixed a bug where :doc:`Query Builder `'s join failed with identifiers containing dashes.
+-  Fixed a bug where :doc:`Query Builder `'s join() method failed with identifiers containing dashes.
 -  Fixed a bug (#1264) - :doc:`Database Forge ` and :doc:`Database Utilities ` didn't update/reset the databases and tables list cache when a table or a database is created, dropped or renamed.
+-  Fixed a bug (#7) - :doc:`Query Builder `'s join() method only escaped one set of conditions.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 079fbfcde095230f304e889217f897031a948f61 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 12 Jun 2012 02:26:58 +0300
Subject: Changed APPPATH, BASEPATH and VIEWPATH to be absolute paths (fixes
 issue #1321) and removed EXT constant

---
 user_guide_src/source/changelog.rst | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 6d2971103..ebf29791b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -33,15 +33,18 @@ Release Date: Not Released
    -  Added support for ics Calendar files to mimes.php
    -  Updated support for xml ('application/xml') and xsl ('application/xml', 'text/xsl') files in mimes.php.
    -  Updated support for doc files in mimes.php.
+   -  Added some more doctypes.
    -  Added Romanian and Greek characters in foreign_characters.php.
    -  Changed logger to only chmod when file is first created.
    -  Removed previously deprecated SHA1 Library.
    -  Removed previously deprecated use of ``$autoload['core']`` in application/config/autoload.php.
       Only entries in ``$autoload['libraries']`` are auto-loaded now.
-   -  Added some more doctypes.
+   -  Removed previously deprecated EXT constant.
    -  Updated all classes to be written in PHP 5 style, with visibility declarations and no ``var`` usage for properties.
    -  Moved error templates to "application/views/errors"
-   -  Global config files are loaded first, then environment ones. Environment config keys overwrite base ones, allowing to only set the keys we want changed per Env.
+   -  Global config files are loaded first, then environment ones. Environment config keys overwrite base ones, allowing to only set the keys we want changed per environment.
+   -  Changed detection of ``$view_folder`` so that if it's not found in the current path, it will now also be searched for under the application folder.
+   -  Path constants BASEPATH, APPPATH and VIEWPATH are now (internally) defined as absolute paths.
 
 -  Helpers
 
@@ -255,6 +258,7 @@ Bug fixes for 3.0
 -  Fixed a bug where :doc:`Query Builder `'s join() method failed with identifiers containing dashes.
 -  Fixed a bug (#1264) - :doc:`Database Forge ` and :doc:`Database Utilities ` didn't update/reset the databases and tables list cache when a table or a database is created, dropped or renamed.
 -  Fixed a bug (#7) - :doc:`Query Builder `'s join() method only escaped one set of conditions.
+-  Fixed a bug (#1321) - Core Exceptions class couldn't find the errors/ folder in some cases.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 782de1101f37b21ff2183fde5b2ed8569d8c287d Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 12 Jun 2012 03:04:50 +0300
Subject: Added MySQLi backup() support

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ebf29791b..f91a1dc99 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -77,6 +77,7 @@ Release Date: Not Released
 	 - OOP style of the PHP extension is now used, instead of the procedural aliases.
 	 - Server version checking is now done via ``mysqli::$server_info`` instead of running an SQL query.
 	 - Added persistent connections support for PHP >= 5.3.
+	 - Added support for backup() in :doc:`Database Utilities `.
    -  Added 'dsn' configuration setting for drivers that support DSN strings (PDO, PostgreSQL, Oracle, ODBC, CUBRID).
    -  Improved PDO database support.
    -  Added Interbase/Firebird database support via the "interbase" driver.
@@ -86,7 +87,7 @@ Release Date: Not Released
    -  Improved support of the PostgreSQL driver, including:
 	 - pg_version() is now used to get the database version number, when possible.
 	 - Added db_set_charset() support.
-	 - Added _optimize_table() support for the :doc:`Database Utility Class ` (rebuilds table indexes).
+	 - Added support for optimize_table() in :doc:`Database Utilities ` (rebuilds table indexes).
 	 - Added boolean data type support in escape().
 	 - Added update_batch() support.
 	 - Removed limit() and order_by() support for UPDATE and DELETE queries in as PostgreSQL does not support those features.
@@ -114,7 +115,7 @@ Release Date: Not Released
 	 - Generally improved for speed and cleaned up all of its components.
 	 - *Row* result methods now really only fetch only the needed number of rows, instead of depending entirely on result().
 	 - num_rows() is now only called explicitly by the developer and no longer re-executes statements.
-   -  Improved support of the Sqlite driver, including:
+   -  Improved support of the SQLite driver, including:
 	 - Added support for replace() in :doc:`Query Builder `.
 	 - Added support for drop_table() in :doc:`Database Forge `.
    -  Added ODBC support for create_database(), drop_database() and drop_table() in :doc:`Database Forge `.
-- 
cgit v1.2.3-24-g4f1b


From c9195a75e7d3d06524c9a5ce97f4f4c30c69019b Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 12 Jun 2012 03:49:03 +0300
Subject: Add changelog for pull #1017

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f91a1dc99..f342abf15 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -256,10 +256,11 @@ Bug fixes for 3.0
 -  Fixed a bug (#1452) - protect_identifiers() didn't properly detect identifiers with spaces in their names.
 -  Fixed a bug where protect_identifiers() ignored it's extra arguments when the value passed to it is an array.
 -  Fixed a bug where _has_operator() didn't detect BETWEEN.
--  Fixed a bug where :doc:`Query Builder `'s join() method failed with identifiers containing dashes.
+-  Fixed a bug in :doc:`Query Builder `'s join() method where it failed with identifiers containing dashes.
 -  Fixed a bug (#1264) - :doc:`Database Forge ` and :doc:`Database Utilities ` didn't update/reset the databases and tables list cache when a table or a database is created, dropped or renamed.
 -  Fixed a bug (#7) - :doc:`Query Builder `'s join() method only escaped one set of conditions.
 -  Fixed a bug (#1321) - Core Exceptions class couldn't find the errors/ folder in some cases.
+-  Fixed a bug in the File-based :doc:`Cache Library ` driver's get_metadata() method where a non-existent array key was accessed for the TTL value.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 5a1e5e34207b9b30ff42200158074953ca1cabab Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 12 Jun 2012 11:28:26 +0300
Subject: Add support for the anchor 'rel' attribute in the Pagination library

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f342abf15..82116c9b1 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -154,7 +154,8 @@ Release Date: Not Released
    -  Added a Redis driver to the :doc:`Caching Library `.
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
    -  Renamed method _set_header() to set_header() and made it public to enable adding custom headers in the :doc:`Email Library `.
-   -  Added an "index" parameter to the data() method in the :doc:`Upload library `.
+   -  Added an "index" parameter to the data() method in the :doc:`Upload Library `.
+   -  Added support for the anchor "rel" attribute in the :doc:`Pagination Library `.
 
 -  Core
 
@@ -177,7 +178,7 @@ Bug fixes for 3.0
 -  Fixed a bug where ``unlink()`` raised an error if cache file did not exist when you try to delete it.
 -  Fixed a bug (#181) where a mis-spelling was in the form validation language file.
 -  Fixed a bug (#159, #163) that mishandled Query Builder nested transactions because _trans_depth was not getting incremented.
--  Fixed a bug (#737, #75) where pagination anchor class was not set properly when using initialize method.
+-  Fixed a bug (#737, #75) - :doc:`Pagination ` anchor class was not set properly when using initialize method.
 -  Fixed a bug (#419) - auto_link() now recognizes URLs that come after a word boundary.
 -  Fixed a bug (#724) - is_unique in form validation now checks that you are connected to a database.
 -  Fixed a bug (#647) - _get_mod_time() in Zip library no longer generates stat failed errors.
-- 
cgit v1.2.3-24-g4f1b


From f696c1fe8df29d54a933804a6f4d182a5a59c7a2 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 12 Jun 2012 12:14:51 +0300
Subject: Fix issue #1202

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 82116c9b1..4962caa7d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -262,6 +262,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#7) - :doc:`Query Builder `'s join() method only escaped one set of conditions.
 -  Fixed a bug (#1321) - Core Exceptions class couldn't find the errors/ folder in some cases.
 -  Fixed a bug in the File-based :doc:`Cache Library ` driver's get_metadata() method where a non-existent array key was accessed for the TTL value.
+-  Fixed a bug (#1202) - :doc:`Encryption Library ` encode_from_legacy() didn't set back the encrypt mode on failure.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 4e9538fe19b09c0dc588542cfb7f793348b83bf7 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 12 Jun 2012 14:16:53 +0300
Subject: Fix issue #145

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4962caa7d..ab3e01394 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -263,6 +263,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1321) - Core Exceptions class couldn't find the errors/ folder in some cases.
 -  Fixed a bug in the File-based :doc:`Cache Library ` driver's get_metadata() method where a non-existent array key was accessed for the TTL value.
 -  Fixed a bug (#1202) - :doc:`Encryption Library ` encode_from_legacy() didn't set back the encrypt mode on failure.
+-  Fixed a bug (#145) - compile_binds() failed when the bind marker was present in a literal string within the query.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From fe8f5e25c8127c0ff7ebb77dd5f9b982e9eb9270 Mon Sep 17 00:00:00 2001
From: Kevin Wood-Friend 
Date: Tue, 12 Jun 2012 09:56:00 -0400
Subject: Updated changelog for set_rules() accepting an array of rules, as
 well as a string.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ab3e01394..33b413163 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -147,6 +147,7 @@ Release Date: Not Released
 	 -  _execute() now considers input data to be invalid if a specified rule is not found.
 	 -  Removed method is_numeric() as it exists as a native PHP function and _execute() will find and use that (the 'is_numeric' rule itself is deprecated since 1.6.1).
 	 -  Native PHP functions used as rules can now accept an additional parameter, other than the data itself.
+	 -  Updated set_rules() to accept an array of rules as well as a string.
    -  Changed the :doc:`Session Library ` to select only one row when using database sessions.
    -  Added all_flashdata() method to session class. Returns an associative array of only flashdata.
    -  Allowed for setting table class defaults in a config file.
-- 
cgit v1.2.3-24-g4f1b


From 6984d153f68f1f89fa6800143498cc4914441d66 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 13 Jun 2012 10:10:17 +0300
Subject: Add a changelog entry

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 33b413163..e955209b1 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -265,6 +265,7 @@ Bug fixes for 3.0
 -  Fixed a bug in the File-based :doc:`Cache Library ` driver's get_metadata() method where a non-existent array key was accessed for the TTL value.
 -  Fixed a bug (#1202) - :doc:`Encryption Library ` encode_from_legacy() didn't set back the encrypt mode on failure.
 -  Fixed a bug (#145) - compile_binds() failed when the bind marker was present in a literal string within the query.
+-  Fixed a bug in protect_identifiers() where if passed along with the field names, operators got escaped as well.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From d461934184d95b0cfb2feec93f27b621ef72a5c2 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 14 Jun 2012 02:27:25 +0300
Subject: Fix issue #10 + URI class speed improvements

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index e955209b1..039e8acf3 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -266,11 +266,12 @@ Bug fixes for 3.0
 -  Fixed a bug (#1202) - :doc:`Encryption Library ` encode_from_legacy() didn't set back the encrypt mode on failure.
 -  Fixed a bug (#145) - compile_binds() failed when the bind marker was present in a literal string within the query.
 -  Fixed a bug in protect_identifiers() where if passed along with the field names, operators got escaped as well.
+-  Fixed a bug (#10) - :doc:`URI Library ` internal method _detect_uri() failed with paths containing a colon.
 
 Version 2.1.1
 =============
 
-Release Date: Not Released
+Release Date: June 13, 2012
 
 -  General Changes
    -  Fixed support for docx, xlsx files in mimes.php.
@@ -295,7 +296,6 @@ Bug fixes for 2.1.1
 -  Fixed a bug (#726) - PDO put a 'dbname' argument in it's connection string regardless of the database platform in use, which made it impossible to use SQLite.
 -  Fixed a bug - CI_DB_pdo_driver::num_rows() was not returning properly value with SELECT queries, cause it was relying on PDOStatement::rowCount().
 -  Fixed a bug (#1059) - CI_Image_lib::clear() was not correctly clearing all necessary object properties, namely width and height.
--  Fixed a bud (#1387) - Active Record's ``from()`` method didn't escape table aliases.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From d163e0b219b8afacea3cd0d1d7c2ce5bb6f8a933 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 14 Jun 2012 03:09:53 +0300
Subject: Polish changes from pull #1233 - Session class already has the
 time_reference setting - 'GMT' is a valid timezone, so nothing needs to be
 changed in order to work properly (upgrade notes) - Altered some description
 text

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 1f5bcb648..06bfba887 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -48,7 +48,7 @@ Release Date: Not Released
 
 -  Helpers
 
-   -  Date helper will now return now() based on the timezone you specify.
+   -  :doc:`Date Helper ` function now() now works with all timezone strings supported by PHP.
    -  ``create_captcha()`` accepts additional colors parameter, allowing for color customization.
    -  ``url_title()`` will now trim extra dashes from beginning and end.
    -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
@@ -173,6 +173,7 @@ Release Date: Not Released
    -  Added get_content_type() method to the :doc:`Output Library `.
    -  Added get_mimes() function to system/core/Commons.php to return the config/mimes.php array.
    -  Added a second argument to set_content_type() in the :doc:`Output Library ` that allows setting the document charset as well.
+   -  $config['time_reference'] now supports all timezone strings supported by PHP.
 
 Bug fixes for 3.0
 ------------------
-- 
cgit v1.2.3-24-g4f1b


From 19c83f6ec6dd29b2ecbeba87801d275f4e247678 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 14 Jun 2012 14:33:33 +0300
Subject: Add changelog entry for issue #1387

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 06bfba887..7748f9b37 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -269,6 +269,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#145) - compile_binds() failed when the bind marker was present in a literal string within the query.
 -  Fixed a bug in protect_identifiers() where if passed along with the field names, operators got escaped as well.
 -  Fixed a bug (#10) - :doc:`URI Library ` internal method _detect_uri() failed with paths containing a colon.
+-  Fixed a bug (#1387) - :doc:`Query Builder `'s from() method didn't escape table aliases.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From d9b44bef948928739b2b96b43d78b7629c0ccc15 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 15 Jun 2012 16:07:08 +0300
Subject: Fix issue #520

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 7748f9b37..ec33414c2 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -270,6 +270,7 @@ Bug fixes for 3.0
 -  Fixed a bug in protect_identifiers() where if passed along with the field names, operators got escaped as well.
 -  Fixed a bug (#10) - :doc:`URI Library ` internal method _detect_uri() failed with paths containing a colon.
 -  Fixed a bug (#1387) - :doc:`Query Builder `'s from() method didn't escape table aliases.
+-  Fixed a bug (#520) - :doc:`Date Helper ` function nice_date() failed when the optional second parameter is not passed.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 51d6d8406d6493d7e3f8783c5d17a4a1970e9fba Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 15 Jun 2012 16:41:09 +0300
Subject: Add support for HTTP code 303 in set_status_header(), as suggested in
 pull #341

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ec33414c2..aeccea281 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -174,6 +174,7 @@ Release Date: Not Released
    -  Added get_mimes() function to system/core/Commons.php to return the config/mimes.php array.
    -  Added a second argument to set_content_type() in the :doc:`Output Library ` that allows setting the document charset as well.
    -  $config['time_reference'] now supports all timezone strings supported by PHP.
+   -  Added support for HTTP code 303 ("See Other") in set_status_header().
 
 Bug fixes for 3.0
 ------------------
-- 
cgit v1.2.3-24-g4f1b


From d1a075d7807ad8177ecb4235dfe16ffe2041f860 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 15 Jun 2012 23:28:52 +0300
Subject: mimes.php: zip, rar, php from pull #1472

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index aeccea281..589cd0046 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -30,9 +30,12 @@ Release Date: Not Released
    -  Added support for 3gp, 3g2, mp4, wmv, f4v, vlc Video files to mimes.php.
    -  Added support for m4a, aac, m4u, xspf, au, ac3, flac, ogg Audio files to mimes.php.
    -  Added support for kmz and kml (Google Earth) files to mimes.php.
-   -  Added support for ics Calendar files to mimes.php
+   -  Added support for ics Calendar files to mimes.php.
+   -  Added support for rar archives to mimes.php.
    -  Updated support for xml ('application/xml') and xsl ('application/xml', 'text/xsl') files in mimes.php.
    -  Updated support for doc files in mimes.php.
+   -  Updated support for php files in mimes.php.
+   -  Updated support for zip files in mimes.php.
    -  Added some more doctypes.
    -  Added Romanian and Greek characters in foreign_characters.php.
    -  Changed logger to only chmod when file is first created.
-- 
cgit v1.2.3-24-g4f1b


From 58ae971ba248cf3e32a139088c3833c9735028de Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 15 Jun 2012 23:44:48 +0300
Subject: Fix issue #167

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 589cd0046..3e5bc8fcb 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -275,6 +275,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#10) - :doc:`URI Library ` internal method _detect_uri() failed with paths containing a colon.
 -  Fixed a bug (#1387) - :doc:`Query Builder `'s from() method didn't escape table aliases.
 -  Fixed a bug (#520) - :doc:`Date Helper ` function nice_date() failed when the optional second parameter is not passed.
+-  Fixed a bug (#167) - ``$config['permitted_uri_chars']`` didn't affect URL-encoded characters.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 0140ddd510edffb901b98de6b80676ece183760c Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 16 Jun 2012 01:12:56 +0300
Subject: Fix issue #318 + added a default to the switch() in
 CI_Output::minify()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3e5bc8fcb..8e0ac10f0 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -276,6 +276,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1387) - :doc:`Query Builder `'s from() method didn't escape table aliases.
 -  Fixed a bug (#520) - :doc:`Date Helper ` function nice_date() failed when the optional second parameter is not passed.
 -  Fixed a bug (#167) - ``$config['permitted_uri_chars']`` didn't affect URL-encoded characters.
+-  Fixed a bug (#318) - :doc:`Profiling ` setting *query_toggle_count* was not settable as described in the manual.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 498c1e027e67dfd8108e0e255ff18fb914742b63 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 16 Jun 2012 03:34:10 +0300
Subject: Added an escape parameter to where_in(), or_where_in(),
 where_not_in(), or_where_not_in() and made where(), or_where() to default the
 escape setting to the value of _protect_identifiers

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8e0ac10f0..b3c2e7086 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -74,8 +74,7 @@ Release Date: Not Released
 	 - Renamed the Active Record class to Query Builder to remove confusion with the Active Record design pattern.
 	 - Added the ability to insert objects with insert_batch().
 	 - Added new methods that return the SQL string of queries without executing them: get_compiled_select(), get_compiled_insert(), get_compiled_update(), get_compiled_delete().
-	 - Added an optional order_by() parameter that allows to disable escaping (useful for custom fields).
-	 - Added an optional join() parameter that allows to disable escaping.
+	 - Added an optional parameter that allows to disable escaping (useful for custom fields) for methods join(), order_by(), where_in(), or_where_in(), where_not_in(), or_where_not_in().
 	 - Added support for join() with multiple conditions.
    -  Improved support for the MySQLi driver, including:
 	 - OOP style of the PHP extension is now used, instead of the procedural aliases.
-- 
cgit v1.2.3-24-g4f1b


From 1764dd7d4ab6e6e5c799eaa9ce007fce48fa0b63 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 16 Jun 2012 18:48:19 +0300
Subject: Fix issue #938 + some related improvements

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b3c2e7086..b9d72642a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -163,12 +163,12 @@ Release Date: Not Released
 
 -  Core
 
-   -  Changed private functions in CI_URI to protected so MY_URI can override them.
+   -  Changed private methods in the :doc:`URI Library ` to protected so MY_URI can override them.
    -  Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
-   -  Added method get_vars() to CI_Loader to retrieve all variables loaded with $this->load->vars().
+   -  Added method get_vars() to the :doc:`Loader Library ` to retrieve all variables loaded with $this->load->vars().
    -  is_loaded() function from system/core/Commons.php now returns a reference.
    -  $config['rewrite_short_tags'] now has no effect when using PHP 5.4 as *` to retrieve $_SERVER['REQUEST_METHOD'].
    -  Modified valid_ip() to use PHP's filter_var() in the :doc:`Input Library `.
    -  Added support for HTTP-Only cookies with new config option ``cookie_httponly`` (default FALSE).
    -  Renamed method _call_hook() to call_hook() in the :doc:`Hooks Library `.
@@ -177,6 +177,7 @@ Release Date: Not Released
    -  Added a second argument to set_content_type() in the :doc:`Output Library ` that allows setting the document charset as well.
    -  $config['time_reference'] now supports all timezone strings supported by PHP.
    -  Added support for HTTP code 303 ("See Other") in set_status_header().
+   -  Changed :doc:`Config Library ` method site_url() to accept an array as well.
 
 Bug fixes for 3.0
 ------------------
@@ -276,6 +277,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#520) - :doc:`Date Helper ` function nice_date() failed when the optional second parameter is not passed.
 -  Fixed a bug (#167) - ``$config['permitted_uri_chars']`` didn't affect URL-encoded characters.
 -  Fixed a bug (#318) - :doc:`Profiling ` setting *query_toggle_count* was not settable as described in the manual.
+-  Fixed a bug (#938) - :doc:`Config Library ` method site_url() added a question mark to the URL string when query strings are enabled even if it already existed.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 95d78cf4f78c0fb685a789c280d106ab242318ef Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 16 Jun 2012 19:54:33 +0300
Subject: Fix issue #999

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b9d72642a..9ef0ce991 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -278,6 +278,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#167) - ``$config['permitted_uri_chars']`` didn't affect URL-encoded characters.
 -  Fixed a bug (#318) - :doc:`Profiling ` setting *query_toggle_count* was not settable as described in the manual.
 -  Fixed a bug (#938) - :doc:`Config Library ` method site_url() added a question mark to the URL string when query strings are enabled even if it already existed.
+-  Fixed a bug (#999) - :doc:`Config Library ` method site_url() always appended ``$config['url_suffix']`` to the end of the URL string, regardless of wether a query string exists in it.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From f0a8410a5cbe080b377ec352320872d27ce7d91f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 16 Jun 2012 20:52:20 +0300
Subject: Fix two anchor_popup() issues

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 9ef0ce991..542c47396 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -279,6 +279,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#318) - :doc:`Profiling ` setting *query_toggle_count* was not settable as described in the manual.
 -  Fixed a bug (#938) - :doc:`Config Library ` method site_url() added a question mark to the URL string when query strings are enabled even if it already existed.
 -  Fixed a bug (#999) - :doc:`Config Library ` method site_url() always appended ``$config['url_suffix']`` to the end of the URL string, regardless of wether a query string exists in it.
+-  Fixed a bug where :doc:`URL Helper ` function anchor_popup() ignored the attributes argument if it is not an array.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 81c3208b79cca353b27ecd4bdf00d4b6e7c91b2c Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 16 Jun 2012 21:21:46 +0300
Subject: anchor_popup() improvements

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 542c47396..dd6fa4603 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -53,7 +53,10 @@ Release Date: Not Released
 
    -  :doc:`Date Helper ` function now() now works with all timezone strings supported by PHP.
    -  ``create_captcha()`` accepts additional colors parameter, allowing for color customization.
-   -  ``url_title()`` will now trim extra dashes from beginning and end.
+   -  :doc:`URL Helper ` changes include:
+	 - ``url_title()`` will now trim extra dashes from beginning and end.
+	 - ``anchor_popup()`` will now fill the "href" attribute with the URL and its JS code will return false instead.
+	 - Added JS window name support to ``anchor_popup()`` function.
    -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
    -  Changed ``humanize()`` to include a second param for the separator.
    -  Refactored ``plural()`` and ``singular()`` to avoid double pluralization and support more words.
-- 
cgit v1.2.3-24-g4f1b


From 88c47278f775413b5a408f48d30bd279e34e601a Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sun, 17 Jun 2012 02:32:31 +0300
Subject: Pagination: fixed 'rel' attribute handling, added custom attributes
 support, deprecated 'anchor_class' setting

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dd6fa4603..4054a04ff 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -162,7 +162,10 @@ Release Date: Not Released
    -  Added dsn (delivery status notification) option to the :doc:`Email Library `.
    -  Renamed method _set_header() to set_header() and made it public to enable adding custom headers in the :doc:`Email Library `.
    -  Added an "index" parameter to the data() method in the :doc:`Upload Library `.
-   -  Added support for the anchor "rel" attribute in the :doc:`Pagination Library `.
+   -  :doc:`Pagination Library ` changes include:
+	 -  Added support for the anchor "rel" attribute.
+	 -  Added support for setting custom attributes.
+	 -  Deprecated usage of the "anchor_class" setting (use the new "attributes" setting instead).
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 3751f9362b731f5f3d2e63176c364d6281fdf415 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sun, 17 Jun 2012 18:07:48 +0300
Subject: Add join() USING support

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4054a04ff..b39d43b1a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -79,6 +79,7 @@ Release Date: Not Released
 	 - Added new methods that return the SQL string of queries without executing them: get_compiled_select(), get_compiled_insert(), get_compiled_update(), get_compiled_delete().
 	 - Added an optional parameter that allows to disable escaping (useful for custom fields) for methods join(), order_by(), where_in(), or_where_in(), where_not_in(), or_where_not_in().
 	 - Added support for join() with multiple conditions.
+	 - Added support for USING in join().
    -  Improved support for the MySQLi driver, including:
 	 - OOP style of the PHP extension is now used, instead of the procedural aliases.
 	 - Server version checking is now done via ``mysqli::$server_info`` instead of running an SQL query.
-- 
cgit v1.2.3-24-g4f1b


From 6ac514484fffd9700c6ecc57cfa1b1fd105e37f6 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 18 Jun 2012 13:05:17 +0300
Subject: Fix issue #1328

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index b39d43b1a..67b78bf8b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -287,6 +287,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#938) - :doc:`Config Library ` method site_url() added a question mark to the URL string when query strings are enabled even if it already existed.
 -  Fixed a bug (#999) - :doc:`Config Library ` method site_url() always appended ``$config['url_suffix']`` to the end of the URL string, regardless of wether a query string exists in it.
 -  Fixed a bug where :doc:`URL Helper ` function anchor_popup() ignored the attributes argument if it is not an array.
+-  Fixed a bug (#1328) - :doc:`Form Validation Library ` didn't properly check the type of the form fields before processing them.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 777153d8362ed884fc3d47ea4a5e1fa0f1ce8ca9 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 18 Jun 2012 13:30:45 +0300
Subject: Changed limit() and offset() to ignore NULL values

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 67b78bf8b..da608b162 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -80,6 +80,8 @@ Release Date: Not Released
 	 - Added an optional parameter that allows to disable escaping (useful for custom fields) for methods join(), order_by(), where_in(), or_where_in(), where_not_in(), or_where_not_in().
 	 - Added support for join() with multiple conditions.
 	 - Added support for USING in join().
+	 - Changed limit() to ignore NULL values instead of always casting to integer.
+	 - Changed offset() to ignore empty values instead of always casting to integer.
    -  Improved support for the MySQLi driver, including:
 	 - OOP style of the PHP extension is now used, instead of the procedural aliases.
 	 - Server version checking is now done via ``mysqli::$server_info`` instead of running an SQL query.
-- 
cgit v1.2.3-24-g4f1b


From 8d3099d4e5261e0f044c7fcd8b3ab7724645aa8d Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 21 Jun 2012 16:00:20 +0300
Subject: Fix issue #79

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index da608b162..8a6c922a4 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -290,6 +290,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#999) - :doc:`Config Library ` method site_url() always appended ``$config['url_suffix']`` to the end of the URL string, regardless of wether a query string exists in it.
 -  Fixed a bug where :doc:`URL Helper ` function anchor_popup() ignored the attributes argument if it is not an array.
 -  Fixed a bug (#1328) - :doc:`Form Validation Library ` didn't properly check the type of the form fields before processing them.
+-  Fixed a bug (#79) - :doc:`Form Validation Library ` didn't properly validate array fields that use associative keys or have custom indexes.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 7540dede0f01acd7aa1ffd224defc5189305a815 Mon Sep 17 00:00:00 2001
From: Mat Whitney 
Date: Fri, 22 Jun 2012 12:02:10 -0700
Subject: Added optional fourth parameter to timezone_menu
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

allows setting one or more attributes on the generated select tag.
This allows passing attributes needed for Section 508 compliance ยง
1194.22(n), such as an id.
http://access-board.gov/sec508/guide/1194.22.htm#(n)
http://www.w3.org/TR/WCAG10-HTML-TECHS/#forms-labels
---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8a6c922a4..c861a1e8d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -70,6 +70,7 @@ Release Date: Not Released
 	 - ``set_realpath()`` can now also handle file paths as opposed to just directories.
 	 - Added an optional paramater to ``delete_files()`` to enable it to skip deleting files such as .htaccess and index.html.
 	 - ``read_file()`` is now a deprecated alias of ``file_get_contents()``.
+   -  :doc:`Date Helper ` Added optional fourth parameter to ``timezone_menu()`` that allows more attributes to be added to the generated select tag
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From 282e02c7d66085d3c6d4c85eed4a1581389b5e63 Mon Sep 17 00:00:00 2001
From: Alex Bilbie 
Date: Sat, 23 Jun 2012 14:11:58 +0100
Subject: Clarified support of $config['csrf_exclude_uris'] support in v3.0
 (#236)

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 8a6c922a4..f8eb59644 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -148,6 +148,7 @@ Release Date: Not Released
 	 -  If property maintain_ratio is set to TRUE, image_reproportion() now doesn't need both width and height to be specified.
    -  Removed SHA1 function in the :doc:`Encryption Library `.
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
+   -  Added $config['csrf_exclude_uris'] to the CSRF protection in the :doc:`Security library `, which allows you list URIs which will not have the CSRF validation functions run.
    -  :doc:`Form Validation library ` changes include:
 	 -  Added method error_array() to return all error messages as an array.
 	 -  Added method set_data() to set an alternative data array to be validated instead of the default $_POST.
@@ -453,7 +454,6 @@ Release Date: August 20, 2011
    -  Added insert_batch() function to the PostgreSQL database driver.
       Thanks to epallerols for the patch.
    -  Added "application/x-csv" to mimes.php.
-   -  Added CSRF protection URI whitelisting.
    -  Fixed a bug where :doc:`Email library `
       attachments with a "." in the name would using invalid MIME-types.
 
-- 
cgit v1.2.3-24-g4f1b


From f82b92999e8309155df3e665e25a261c26b0e93d Mon Sep 17 00:00:00 2001
From: Phil Sturgeon 
Date: Sat, 23 Jun 2012 15:49:23 +0100
Subject: Added ['reuse_query_string'] to Pagination. This allows automatic
 repopulation of query string arguments, combined with normal URI segments.

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f8eb59644..29084ed9b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -170,6 +170,7 @@ Release Date: Not Released
 	 -  Added support for the anchor "rel" attribute.
 	 -  Added support for setting custom attributes.
 	 -  Deprecated usage of the "anchor_class" setting (use the new "attributes" setting instead).
+	 -  Added $config['reuse_query_string'] to allow automatic repopulation of query string arguments, combined with normal URI segments.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 965703d4aadec14010b2875b11c40763bf1985df Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 25 Jun 2012 18:20:46 +0300
Subject: Add changelog entry

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 29084ed9b..e7c0fc83c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -130,6 +130,7 @@ Release Date: Not Released
    -  Added ODBC support for create_database(), drop_database() and drop_table() in :doc:`Database Forge `.
    -  Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge `.
    -  Added unbuffered_row() method for getting a row without prefetching whole result (consume less memory).
+   -  Added subdrivers support (currently only used by PDO).
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From ce79be0b5ffc9d5754c93771a8c289a252ec437b Mon Sep 17 00:00:00 2001
From: Derek Jones 
Date: Mon, 25 Jun 2012 23:23:46 -0700
Subject: Fixing various Sphinx bugs and syntax errors in docs

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 28e2f94bb..e6afd350a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -358,7 +358,7 @@ Release Date: November 14, 2011
       injection.
    -  Added additional option 'none' for the optional third argument for
       $this->db->like() in the :doc:`Database
-      Driver `.
+      Driver `.
    -  Added $this->db->insert_batch() support to the OCI8 (Oracle) driver.
    -  Added failover if the main connections in the config should fail
 
@@ -1632,27 +1632,27 @@ Release Date: January 30, 2008
 -  Active Record
 
    -  Added protect_identifiers() in :doc:`Active
-      Record <./database/active_record>`.
+      Record <./database/query_builder>`.
    -  All AR queries are backticked if appropriate to the database.
    -  Added where_in(), or_where_in(), where_not_in(),
       or_where_not_in(), not_like() and or_not_like() to :doc:`Active
-      Record <./database/active_record>`.
+      Record <./database/query_builder>`.
    -  Added support for limit() into update() and delete() statements in
-      :doc:`Active Record <./database/active_record>`.
+      :doc:`Active Record <./database/query_builder>`.
    -  Added empty_table() and truncate_table() to :doc:`Active
-      Record <./database/active_record>`.
+      Record <./database/query_builder>`.
    -  Added the ability to pass an array of tables to the delete()
-      statement in :doc:`Active Record <./database/active_record>`.
+      statement in :doc:`Active Record <./database/query_builder>`.
    -  Added count_all_results() function to :doc:`Active
-      Record <./database/active_record>`.
+      Record <./database/query_builder>`.
    -  Added select_max(), select_min(), select_avg() and
-      select_sum() to :doc:`Active Record <./database/active_record>`.
+      select_sum() to :doc:`Active Record <./database/query_builder>`.
    -  Added the ability to use aliases with joins in :doc:`Active
-      Record <./database/active_record>`.
+      Record <./database/query_builder>`.
    -  Added a third parameter to Active Record's like() clause to
       control where the wildcard goes.
    -  Added a third parameter to set() in :doc:`Active
-      Record <./database/active_record>` that withholds escaping
+      Record <./database/query_builder>` that withholds escaping
       data.
    -  Changed the behaviour of variables submitted to the where() clause
       with no values to auto set "IS NULL"
@@ -1760,7 +1760,7 @@ Release Date: January 30, 2008
       the table of contents of the userguide.
    -  Moved part of the userguide menu javascript to an external file.
    -  Documented distinct() in :doc:`Active
-      Record <./database/active_record>`.
+      Record <./database/query_builder>`.
    -  Documented the timezones() function in the :doc:`Date
       Helper <./helpers/date_helper>`.
    -  Documented unset_userdata in the :doc:`Session
@@ -2336,9 +2336,9 @@ Release Date: April 11, 2006
    function <./general/views>`: $this->load->view('my_view',
    $object);
 -  Added getwhere function to :doc:`Active Record
-   class <./database/active_record>`.
+   class <./database/query_builder>`.
 -  Added count_all function to :doc:`Active Record
-   class <./database/active_record>`.
+   class <./database/query_builder>`.
 -  Added language file for scaffolding and fixed a scaffolding bug that
    occurs when there are no rows in the specified table.
 -  Added :doc:`$this->db->last_query() <./database/queries>`, which
@@ -2363,7 +2363,7 @@ Release Date: April 3, 2006
 -  Added support for :doc:`Models `.
 -  Redesigned the database libraries to support additional RDBMs
    (Postgres, MySQLi, etc.).
--  Redesigned the :doc:`Active Record class <./database/active_record>`
+-  Redesigned the :doc:`Active Record class <./database/query_builder>`
    to enable more varied types of queries with simpler syntax, and
    advanced features like JOINs.
 -  Added a feature to the database class that lets you run :doc:`custom
@@ -2396,7 +2396,7 @@ Release Date: April 3, 2006
    whether PHP 4 or 5 is being run, since PHP 5 allows a more graceful
    way to manage objects that utilizes a bit less resources.
 -  Deprecated: $this->db->use_table() has been deprecated. Please read
-   the :doc:`Active Record <./database/active_record>` page for
+   the :doc:`Active Record <./database/query_builder>` page for
    information.
 -  Deprecated: $this->db->smart_escape_str() has been deprecated.
    Please use this instead: $this->db->escape()
-- 
cgit v1.2.3-24-g4f1b


From 1a24a9da3cfbacf8802ffd0b79f5494d30278007 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 27 Jun 2012 00:52:47 +0300
Subject: Fix issue #427

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 28e2f94bb..27381b49a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -70,7 +70,8 @@ Release Date: Not Released
 	 - ``set_realpath()`` can now also handle file paths as opposed to just directories.
 	 - Added an optional paramater to ``delete_files()`` to enable it to skip deleting files such as .htaccess and index.html.
 	 - ``read_file()`` is now a deprecated alias of ``file_get_contents()``.
-   -  :doc:`Date Helper ` Added optional fourth parameter to ``timezone_menu()`` that allows more attributes to be added to the generated select tag
+   -  Added an optional parameter to :doc:`Date Helper ` function ``timezone_menu()`` that allows more attributes to be added to the generated select tag.
+   -  :doc:`Security Helper ` function ``strip_image_tags()`` is now an alias for the same method in the :doc:`Security Library `.
 
 -  Database
 
@@ -190,6 +191,7 @@ Release Date: Not Released
    -  $config['time_reference'] now supports all timezone strings supported by PHP.
    -  Added support for HTTP code 303 ("See Other") in set_status_header().
    -  Changed :doc:`Config Library ` method site_url() to accept an array as well.
+   -  Added method ``strip_image_tags()`` to the :doc:`Security Library `.
 
 Bug fixes for 3.0
 ------------------
@@ -294,6 +296,7 @@ Bug fixes for 3.0
 -  Fixed a bug where :doc:`URL Helper ` function anchor_popup() ignored the attributes argument if it is not an array.
 -  Fixed a bug (#1328) - :doc:`Form Validation Library ` didn't properly check the type of the form fields before processing them.
 -  Fixed a bug (#79) - :doc:`Form Validation Library ` didn't properly validate array fields that use associative keys or have custom indexes.
+-  Fixed a bug (#427) - :doc:`Form Validation Library ` method ``strip_image_tags()`` was an alias to a non-existent method.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From 2fce2a95e99c91c57f7d15b5e441b2cf89193da3 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 27 Jun 2012 01:07:56 +0300
Subject: URL Helper redirect() to utilize HTTP/1.1 response code 303 See Other

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 27381b49a..17fb6472a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -57,6 +57,7 @@ Release Date: Not Released
 	 - ``url_title()`` will now trim extra dashes from beginning and end.
 	 - ``anchor_popup()`` will now fill the "href" attribute with the URL and its JS code will return false instead.
 	 - Added JS window name support to ``anchor_popup()`` function.
+	 - Added support (auto-detection) for HTTP/1.1 response code 303 in ``redirect()``.
    -  Added XHTML Basic 1.1 doctype to :doc:`HTML Helper `.
    -  Changed ``humanize()`` to include a second param for the separator.
    -  Refactored ``plural()`` and ``singular()`` to avoid double pluralization and support more words.
-- 
cgit v1.2.3-24-g4f1b


From 384b34217b3709d3b3f11dbda3ac5c53274ff117 Mon Sep 17 00:00:00 2001
From: Timothy Warren 
Date: Wed, 27 Jun 2012 08:06:06 -0400
Subject: Update other email validation methods

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c0fa9d7f7..cc6220253 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -73,6 +73,7 @@ Release Date: Not Released
 	 - ``read_file()`` is now a deprecated alias of ``file_get_contents()``.
    -  Added an optional parameter to :doc:`Date Helper ` function ``timezone_menu()`` that allows more attributes to be added to the generated select tag.
    -  :doc:`Security Helper ` function ``strip_image_tags()`` is now an alias for the same method in the :doc:`Security Library `.
+   -  Updated email validation methods to use filter_var so they are more accurate.
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From 580388bc79e340ddf44f52853524ecc03b9d339c Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 27 Jun 2012 15:43:46 +0300
Subject: valid_email() to always return boolean

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index cc6220253..70d0c80a9 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -48,6 +48,7 @@ Release Date: Not Released
    -  Global config files are loaded first, then environment ones. Environment config keys overwrite base ones, allowing to only set the keys we want changed per environment.
    -  Changed detection of ``$view_folder`` so that if it's not found in the current path, it will now also be searched for under the application folder.
    -  Path constants BASEPATH, APPPATH and VIEWPATH are now (internally) defined as absolute paths.
+   -  Updated email validation methods to use filter_var() instead of PCRE.
 
 -  Helpers
 
@@ -73,7 +74,6 @@ Release Date: Not Released
 	 - ``read_file()`` is now a deprecated alias of ``file_get_contents()``.
    -  Added an optional parameter to :doc:`Date Helper ` function ``timezone_menu()`` that allows more attributes to be added to the generated select tag.
    -  :doc:`Security Helper ` function ``strip_image_tags()`` is now an alias for the same method in the :doc:`Security Library `.
-   -  Updated email validation methods to use filter_var so they are more accurate.
 
 -  Database
 
-- 
cgit v1.2.3-24-g4f1b


From d580999cead0aa37d705c2f32e02712a2d522deb Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 28 Jun 2012 14:06:54 +0300
Subject: Fix issue #1545

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 70d0c80a9..d2774ca12 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -299,6 +299,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1328) - :doc:`Form Validation Library ` didn't properly check the type of the form fields before processing them.
 -  Fixed a bug (#79) - :doc:`Form Validation Library ` didn't properly validate array fields that use associative keys or have custom indexes.
 -  Fixed a bug (#427) - :doc:`Form Validation Library ` method ``strip_image_tags()`` was an alias to a non-existent method.
+-  Fixed a bug (#1545) - :doc:`Query Builder ` method ``limit()`` wasn't executed properly under Oracle.
 
 Version 2.1.1
 =============
-- 
cgit v1.2.3-24-g4f1b


From c254792b02cccebb10993feed58fb9ed63a28ebc Mon Sep 17 00:00:00 2001
From: Christopher Guiney 
Date: Sun, 1 Jul 2012 12:10:29 -0700
Subject: updated the changelog

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d2774ca12..50dab92ac 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -136,7 +136,7 @@ Release Date: Not Released
    -  Added unbuffered_row() method for getting a row without prefetching whole result (consume less memory).
 
 -  Libraries
-
+   -  CI_Session now respects php.ini's session.gc_probability and session.gc_divisor
    -  Added max_filename_increment config setting for Upload library.
    -  CI_Loader::_ci_autoloader() is now a protected method.
    -  Added custom filename to Email::attach() as $this->email->attach($filename, $disposition, $newname).
-- 
cgit v1.2.3-24-g4f1b


From ec90216969c2d7bea46a073ecc9c8a95d42f7d92 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 2 Jul 2012 15:57:34 +0300
Subject: Update changelog with changes from 2.1.2

---
 user_guide_src/source/changelog.rst | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 50dab92ac..5f38b58b3 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -301,10 +301,18 @@ Bug fixes for 3.0
 -  Fixed a bug (#427) - :doc:`Form Validation Library ` method ``strip_image_tags()`` was an alias to a non-existent method.
 -  Fixed a bug (#1545) - :doc:`Query Builder ` method ``limit()`` wasn't executed properly under Oracle.
 
+Version 2.1.2
+=============
+
+Release Date: June 29, 2012
+
+-  General Changes
+   -  Improved security in ``xss_clean()``.
+
 Version 2.1.1
 =============
 
-Release Date: June 13, 2012
+Release Date: June 12, 2012
 
 -  General Changes
    -  Fixed support for docx, xlsx files in mimes.php.
@@ -315,20 +323,20 @@ Release Date: June 13, 2012
    -  Added support for the IP format parameter to the :doc:`Form Validation Library `.
 
 -  Helpers
-   -  url_title() performance and output improved. You can now use any string as the word delimiter, but 'dash' and 'underscore' are still supported.
+   -  ``url_title()`` performance and output improved. You can now use any string as the word delimiter, but 'dash' and 'underscore' are still supported.
 
 Bug fixes for 2.1.1
 -------------------
 
--  Fixed a bug (#697) - A wrong array key was used in the Upload library to check for mime-types.
--  Fixed a bug - form_open() compared $action against site_url() instead of base_url().
--  Fixed a bug - CI_Upload::_file_mime_type() could've failed if mime_content_type() is used for the detection and returns FALSE.
+-  Fixed a bug (#697) - A wrong array key was used in the :doc:`File Uploading Library ` to check for mime-types.
+-  Fixed a bug - ``form_open()`` compared $action against ``site_url()`` instead of ``base_url()``.
+-  Fixed a bug - ``CI_Upload::_file_mime_type()`` could've failed if ``mime_content_type()`` is used for the detection and returns FALSE.
 -  Fixed a bug (#538) - Windows paths were ignored when using the :doc:`Image Manipulation Library ` to create a new file.
 -  Fixed a bug - When database caching was enabled, $this->db->query() checked the cache before binding variables which resulted in cached queries never being found.
 -  Fixed a bug - CSRF cookie value was allowed to be any (non-empty) string before being written to the output, making code injection a risk.
 -  Fixed a bug (#726) - PDO put a 'dbname' argument in it's connection string regardless of the database platform in use, which made it impossible to use SQLite.
--  Fixed a bug - CI_DB_pdo_driver::num_rows() was not returning properly value with SELECT queries, cause it was relying on PDOStatement::rowCount().
--  Fixed a bug (#1059) - CI_Image_lib::clear() was not correctly clearing all necessary object properties, namely width and height.
+-  Fixed a bug - ``CI_DB_pdo_driver::num_rows()`` was not returning properly value with SELECT queries, cause it was relying on ``PDOStatement::rowCount()``.
+-  Fixed a bug (#1059) - ``CI_Image_lib::clear()`` was not correctly clearing all necessary object properties, namely width and height.
 
 Version 2.1.0
 =============
-- 
cgit v1.2.3-24-g4f1b


From a6ea5721bc34fe8666d403637e3bd84772e73566 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 2 Jul 2012 16:33:11 +0300
Subject: Fix issue #1551

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 5f38b58b3..4dc6c3f8e 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -300,6 +300,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#79) - :doc:`Form Validation Library ` didn't properly validate array fields that use associative keys or have custom indexes.
 -  Fixed a bug (#427) - :doc:`Form Validation Library ` method ``strip_image_tags()`` was an alias to a non-existent method.
 -  Fixed a bug (#1545) - :doc:`Query Builder ` method ``limit()`` wasn't executed properly under Oracle.
+-  Fixed a bug (#1551) - :doc:`Date Helper ` function ``standard_date()`` didn't properly format *W3C* and *ATOM* standard dates.
 
 Version 2.1.2
 =============
-- 
cgit v1.2.3-24-g4f1b


From c02e7c5d929d17e3448b944e2279a4c6dc338614 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 2 Jul 2012 16:43:43 +0300
Subject: Add changelog entry for pull #1556

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4dc6c3f8e..d8b935252 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -175,6 +175,7 @@ Release Date: Not Released
 	 -  Added support for setting custom attributes.
 	 -  Deprecated usage of the "anchor_class" setting (use the new "attributes" setting instead).
 	 -  Added $config['reuse_query_string'] to allow automatic repopulation of query string arguments, combined with normal URI segments.
+   -  Added the ability to use a proxy with the :doc:`XML-RPC Library `.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From 655cfb789ec2a818ab0c8735224db1a4f79cdef0 Mon Sep 17 00:00:00 2001
From: Omar 
Date: Mon, 2 Jul 2012 13:53:00 -0300
Subject: Added changelog entry

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d2774ca12..a2446259a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -150,6 +150,7 @@ Release Date: Not Released
 	 -  Added support for 3-length hex color values for wm_font_color and wm_shadow_color properties, as well as validation for them.
 	 -  Class properties wm_font_color, wm_shadow_color and wm_use_drop_shadow are now protected, to avoid breaking the text_watermark() method if they are set manually after initialization.
 	 -  If property maintain_ratio is set to TRUE, image_reproportion() now doesn't need both width and height to be specified.
+	 -  Property maintain_ratio is now taken into account when resizing images using ImageMagick library
    -  Removed SHA1 function in the :doc:`Encryption Library `.
    -  Added $config['csrf_regeneration'] to the CSRF protection in the :doc:`Security library `, which makes token regeneration optional.
    -  Added $config['csrf_exclude_uris'] to the CSRF protection in the :doc:`Security library `, which allows you list URIs which will not have the CSRF validation functions run.
-- 
cgit v1.2.3-24-g4f1b


From ac57033236d5b62ba553b6bea87623f0dbeb2f49 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 4 Jul 2012 13:04:10 +0300
Subject: Deprecate Date helper standard_date()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index efe49cfe0..37063f752 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -52,7 +52,11 @@ Release Date: Not Released
 
 -  Helpers
 
-   -  :doc:`Date Helper ` function now() now works with all timezone strings supported by PHP.
+   -  :doc:`Date Helper ` changes include:
+	 - ``now()`` now works with all timezone strings supported by PHP.
+	 - Added an optional third parameter to ``timespan()`` that constrains the number of time units displayed.
+	 - Added an optional parameter to ``timezone_menu()`` that allows more attributes to be added to the generated select tag.
+	 - Deprecated ``standard_date()``, which now just uses the native ``date()`` with `DateTime constants `_.
    -  ``create_captcha()`` accepts additional colors parameter, allowing for color customization.
    -  :doc:`URL Helper ` changes include:
 	 - ``url_title()`` will now trim extra dashes from beginning and end.
@@ -63,7 +67,6 @@ Release Date: Not Released
    -  Changed ``humanize()`` to include a second param for the separator.
    -  Refactored ``plural()`` and ``singular()`` to avoid double pluralization and support more words.
    -  Added an optional third parameter to ``force_download()`` that enables/disables sending the actual file MIME type in the Content-Type header (disabled by default).
-   -  Added an optional third parameter to ``timespan()`` that constrains the number of time units displayed.
    -  Added a work-around in ``force_download()`` for a bug Android <= 2.1, where the filename extension needs to be in uppercase.
    -  ``form_dropdown()`` will now also take an array for unity with other form helpers.
    -  ``do_hash()`` now uses PHP's native ``hash()`` function (supporting more algorithms) and is deprecated.
@@ -72,7 +75,6 @@ Release Date: Not Released
 	 - ``set_realpath()`` can now also handle file paths as opposed to just directories.
 	 - Added an optional paramater to ``delete_files()`` to enable it to skip deleting files such as .htaccess and index.html.
 	 - ``read_file()`` is now a deprecated alias of ``file_get_contents()``.
-   -  Added an optional parameter to :doc:`Date Helper ` function ``timezone_menu()`` that allows more attributes to be added to the generated select tag.
    -  :doc:`Security Helper ` function ``strip_image_tags()`` is now an alias for the same method in the :doc:`Security Library `.
 
 -  Database
-- 
cgit v1.2.3-24-g4f1b


From be3177f7614c96ad3137ddb9764d5e1188c6f9bc Mon Sep 17 00:00:00 2001
From: Derek Jones 
Date: Wed, 4 Jul 2012 07:02:55 -0700
Subject: Fixed a change log formatting issue and doc reference

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d8b935252..a2788ca77 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -136,6 +136,7 @@ Release Date: Not Released
    -  Added unbuffered_row() method for getting a row without prefetching whole result (consume less memory).
 
 -  Libraries
+
    -  CI_Session now respects php.ini's session.gc_probability and session.gc_divisor
    -  Added max_filename_increment config setting for Upload library.
    -  CI_Loader::_ci_autoloader() is now a protected method.
@@ -175,7 +176,7 @@ Release Date: Not Released
 	 -  Added support for setting custom attributes.
 	 -  Deprecated usage of the "anchor_class" setting (use the new "attributes" setting instead).
 	 -  Added $config['reuse_query_string'] to allow automatic repopulation of query string arguments, combined with normal URI segments.
-   -  Added the ability to use a proxy with the :doc:`XML-RPC Library `.
+   -  Added the ability to use a proxy with the :doc:`XML-RPC Library `.
 
 -  Core
 
-- 
cgit v1.2.3-24-g4f1b


From f3b7fa268d0c10c43e48952c44ad617167c0e387 Mon Sep 17 00:00:00 2001
From: Christopher Guiney 
Date: Wed, 4 Jul 2012 12:30:37 -0700
Subject: updated the changelog, fixed some whitespace

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d2774ca12..9f759a0ea 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -178,6 +178,7 @@ Release Date: Not Released
 
 -  Core
 
+   -  _exception_handler now respects php.ini's display_errors
    -  Changed private methods in the :doc:`URI Library ` to protected so MY_URI can override them.
    -  Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
    -  Added method get_vars() to the :doc:`Loader Library ` to retrieve all variables loaded with $this->load->vars().
-- 
cgit v1.2.3-24-g4f1b


From 626f1a657206a8b33a59c20388d0ec4de4593487 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 4 Jul 2012 22:38:52 +0300
Subject: Add PDO support for list_fields()

Signed-off-by: Andrey Andreev 
---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f69ce5c15..e5c46ff93 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -136,6 +136,7 @@ Release Date: Not Released
    -  Added ODBC support for create_database(), drop_database() and drop_table() in :doc:`Database Forge `.
    -  Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge `.
    -  Added unbuffered_row() method for getting a row without prefetching whole result (consume less memory).
+   -  Added PDO support for ``list_fields()`` in :doc:`Database Results `.
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From f5a8530cc937d193aa928bc25f2970eae772d6ef Mon Sep 17 00:00:00 2001
From: Rene Brokholm 
Date: Thu, 5 Jul 2012 09:05:32 +0200
Subject: code cleanup and changelog added

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index e5c46ff93..9a7cec320 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -137,6 +137,7 @@ Release Date: Not Released
    -  Added PDO support for create_database(), drop_database and drop_table() in :doc:`Database Forge `.
    -  Added unbuffered_row() method for getting a row without prefetching whole result (consume less memory).
    -  Added PDO support for ``list_fields()`` in :doc:`Database Results `.
+   -  Added capability for packages to hold database.php config files 
 
 -  Libraries
 
-- 
cgit v1.2.3-24-g4f1b


From 26086874ebb5425a38e879018f9a654182f93b40 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 5 Jul 2012 11:21:58 +0300
Subject: Rename the 'interbase' DB driver to 'ibase' in order to match PHP's
 function prefix

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 9a7cec320..bfbb1bf18 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -95,7 +95,7 @@ Release Date: Not Released
 	 - Added support for backup() in :doc:`Database Utilities `.
    -  Added 'dsn' configuration setting for drivers that support DSN strings (PDO, PostgreSQL, Oracle, ODBC, CUBRID).
    -  Improved PDO database support.
-   -  Added Interbase/Firebird database support via the "interbase" driver.
+   -  Added Interbase/Firebird database support via the 'ibase' driver.
    -  Added an optional database name parameter to db_select().
    -  Replaced the _error_message() and _error_number() methods with error(), that returns an array containing the last database error code and message.
    -  Improved version() implementation so that drivers that have a native function to get the version number don't have to be defined in the core DB_driver class.
-- 
cgit v1.2.3-24-g4f1b


From c7db6bb9b64c8322af4d727bcb71122cd7f09dbf Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 5 Jul 2012 15:11:20 +0300
Subject: Clean-up the separate drivers' DB result classes from no longer
 needed methods

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index bfbb1bf18..716e08f63 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -128,7 +128,6 @@ Release Date: Not Released
 	 - Added support for drop_table() in :doc:`Database Forge `.
 	 - Added support for list_databases() in :doc:`Database Utilities `.
 	 - Generally improved for speed and cleaned up all of its components.
-	 - *Row* result methods now really only fetch only the needed number of rows, instead of depending entirely on result().
 	 - num_rows() is now only called explicitly by the developer and no longer re-executes statements.
    -  Improved support of the SQLite driver, including:
 	 - Added support for replace() in :doc:`Query Builder `.
-- 
cgit v1.2.3-24-g4f1b


From 49aa45b45e1cc83cb61d1524ba32d6c188dac2e1 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 6 Jul 2012 16:22:21 +0300
Subject: Fix a few join() bugs

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 716e08f63..75229f91f 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -307,6 +307,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#427) - :doc:`Form Validation Library ` method ``strip_image_tags()`` was an alias to a non-existent method.
 -  Fixed a bug (#1545) - :doc:`Query Builder ` method ``limit()`` wasn't executed properly under Oracle.
 -  Fixed a bug (#1551) - :doc:`Date Helper ` function ``standard_date()`` didn't properly format *W3C* and *ATOM* standard dates.
+-  Fixed a bug in :doc:`Query Builder ` method join() where literal values were escaped as if they were fields.
 
 Version 2.1.2
 =============
-- 
cgit v1.2.3-24-g4f1b


From 3d9cec94b7cfd621111cb31808b23a1b6eaccf65 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sun, 8 Jul 2012 21:50:19 +0300
Subject: #1558

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 75229f91f..c2e33e7d2 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -167,6 +167,7 @@ Release Date: Not Released
 	 -  Removed method is_numeric() as it exists as a native PHP function and _execute() will find and use that (the 'is_numeric' rule itself is deprecated since 1.6.1).
 	 -  Native PHP functions used as rules can now accept an additional parameter, other than the data itself.
 	 -  Updated set_rules() to accept an array of rules as well as a string.
+	 -  Fields that have empty rules set no longer run through validation (and therefore are not considered erroneous).
    -  Changed the :doc:`Session Library ` to select only one row when using database sessions.
    -  Added all_flashdata() method to session class. Returns an associative array of only flashdata.
    -  Allowed for setting table class defaults in a config file.
-- 
cgit v1.2.3-24-g4f1b


From cbb654d9b332b65c5e2ae6f7bf8936b425b709ac Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Tue, 10 Jul 2012 11:36:32 +0300
Subject: Follow-up to #1398, #1548

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index f3c5cf72a..0e9ec5e50 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -48,7 +48,8 @@ Release Date: Not Released
    -  Global config files are loaded first, then environment ones. Environment config keys overwrite base ones, allowing to only set the keys we want changed per environment.
    -  Changed detection of ``$view_folder`` so that if it's not found in the current path, it will now also be searched for under the application folder.
    -  Path constants BASEPATH, APPPATH and VIEWPATH are now (internally) defined as absolute paths.
-   -  Updated email validation methods to use filter_var() instead of PCRE.
+   -  Updated email validation methods to use ``filter_var()`` instead of PCRE.
+   -  Changed environment defaults to report all errors in 'development' and only fatal ones in 'testing' and 'production' but only display them in 'development'.
 
 -  Helpers
 
@@ -186,7 +187,6 @@ Release Date: Not Released
 
 -  Core
 
-   -  _exception_handler now respects php.ini's display_errors
    -  Changed private methods in the :doc:`URI Library ` to protected so MY_URI can override them.
    -  Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
    -  Added method get_vars() to the :doc:`Loader Library ` to retrieve all variables loaded with $this->load->vars().
@@ -203,6 +203,8 @@ Release Date: Not Released
    -  Added support for HTTP code 303 ("See Other") in set_status_header().
    -  Changed :doc:`Config Library ` method site_url() to accept an array as well.
    -  Added method ``strip_image_tags()`` to the :doc:`Security Library `.
+   -  Changed ``_exception_handler()`` to respect php.ini 'display_errors' setting.
+
 
 Bug fixes for 3.0
 ------------------
@@ -311,6 +313,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1545) - :doc:`Query Builder ` method ``limit()`` wasn't executed properly under Oracle.
 -  Fixed a bug (#1551) - :doc:`Date Helper ` function ``standard_date()`` didn't properly format *W3C* and *ATOM* standard dates.
 -  Fixed a bug in :doc:`Query Builder ` method join() where literal values were escaped as if they were fields.
+-  Fixed a bug (#135) - PHP Error logging was impossible without the errors being displayed.
 
 Version 2.1.2
 =============
-- 
cgit v1.2.3-24-g4f1b


From 6b114ae363eb94328b9d367492ae1b555a19a26c Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 13 Jul 2012 12:05:52 +0300
Subject: Fix issue #1613

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 0e9ec5e50..0c605dc6a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -314,6 +314,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#1551) - :doc:`Date Helper ` function ``standard_date()`` didn't properly format *W3C* and *ATOM* standard dates.
 -  Fixed a bug in :doc:`Query Builder ` method join() where literal values were escaped as if they were fields.
 -  Fixed a bug (#135) - PHP Error logging was impossible without the errors being displayed.
+-  Fixed a bug (#1613) - :doc:`Form Helper ` functions ``form_multiselect()``, ``form_dropdown()`` didn't properly handle empty array option groups.
 
 Version 2.1.2
 =============
-- 
cgit v1.2.3-24-g4f1b


From 685cdd7a28a8e7ec5a3769e2b0d2cdd40c8f6bf9 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 13 Jul 2012 20:11:13 +0300
Subject: Add a changelog entry for issue #1605 (pull #1606) and remove some
 spaces

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 0c605dc6a..68719efa7 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -315,6 +315,7 @@ Bug fixes for 3.0
 -  Fixed a bug in :doc:`Query Builder ` method join() where literal values were escaped as if they were fields.
 -  Fixed a bug (#135) - PHP Error logging was impossible without the errors being displayed.
 -  Fixed a bug (#1613) - :doc:`Form Helper ` functions ``form_multiselect()``, ``form_dropdown()`` didn't properly handle empty array option groups.
+-  Fixed a bug (#1605) - :doc:`Pagination Library ` produced incorrect *previous* and *next* link values.
 
 Version 2.1.2
 =============
-- 
cgit v1.2.3-24-g4f1b


From ede49ba66b127535f3430e20aac72ceed2c4611a Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 23 Jul 2012 16:06:36 +0300
Subject: Fix a bug in CI_DB_sqlsrv_driver::affected_rows()

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

(limited to 'user_guide_src/source/changelog.rst')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 68719efa7..6ba416856 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -316,6 +316,7 @@ Bug fixes for 3.0
 -  Fixed a bug (#135) - PHP Error logging was impossible without the errors being displayed.
 -  Fixed a bug (#1613) - :doc:`Form Helper ` functions ``form_multiselect()``, ``form_dropdown()`` didn't properly handle empty array option groups.
 -  Fixed a bug (#1605) - :doc:`Pagination Library ` produced incorrect *previous* and *next* link values.
+-  Fixed a bug in SQLSRV's ``affected_rows()`` method where an erroneous function name was used.
 
 Version 2.1.2
 =============
-- 
cgit v1.2.3-24-g4f1b