Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

removed conflict markers

  • Loading branch information...
commit a9a1d2520493211ca35f7ab56866d0e154afc1c3 1 parent 33b321b
Jonatas Miguel jdfm authored

Showing 1 changed file with 0 additions and 24 deletions. Show diff stats Hide diff stats

  1. +0 24 user_guide_src/source/changelog.rst
24 user_guide_src/source/changelog.rst
Source Rendered
@@ -145,11 +145,7 @@ Release Date: Not Released
145 145 - Added PDO support for ``create_database()``, ``drop_database()`` and ``drop_table()`` in :doc:`Database Forge <database/forge>`.
146 146 - Added ``unbuffered_row()`` method for getting a row without prefetching whole result (consume less memory).
147 147 - Added PDO support for ``list_fields()`` in :doc:`Database Results <database/results>`.
148   -<<<<<<< HEAD
149   - - Added capability for packages to hold database.php config files
150   -=======
151 148 - Added capability for packages to hold *database.php* config files
152   ->>>>>>> a7001e968a4791312391eb245ad84888893cda8f
153 149 - Added subdrivers support (currently only used by PDO).
154 150 - Added MySQL client compression support.
155 151 - Added encrypted connections support (for *mysql*, *sqlsrv* and PDO with *sqlsrv*).
@@ -228,25 +224,6 @@ Release Date: Not Released
228 224 - Core
229 225
230 226 - Changed private methods in the :doc:`URI Library <libraries/uri>` to protected so MY_URI can override them.
231   -<<<<<<< HEAD
232   - - Removed CI_CORE boolean constant from CodeIgniter.php (no longer Reactor and Core versions).
233   - - Added method get_vars() to the :doc:`Loader Library <libraries/loader>` to retrieve all variables loaded with $this->load->vars().
234   - - is_loaded() function from system/core/Commons.php now returns a reference.
235   - - $config['rewrite_short_tags'] now has no effect when using PHP 5.4 as *<?=* will always be available.
236   - - Added method() to the :doc:`Input Library <libraries/input>` to retrieve $_SERVER['REQUEST_METHOD'].
237   - - Modified valid_ip() to use PHP's filter_var() in the :doc:`Input Library <libraries/input>`.
238   - - Added support for HTTP-Only cookies with new config option ``cookie_httponly`` (default FALSE).
239   - - Renamed method _call_hook() to call_hook() in the :doc:`Hooks Library <general/hooks>`.
240   - - Added get_content_type() method to the :doc:`Output Library <libraries/output>`.
241   - - Added get_mimes() function to system/core/Commons.php to return the config/mimes.php array.
242   - - Added a second argument to set_content_type() in the :doc:`Output Library <libraries/output>` that allows setting the document charset as well.
243   - - $config['time_reference'] now supports all timezone strings supported by PHP.
244   - - Added support for HTTP code 303 ("See Other") in set_status_header().
245   - - Changed :doc:`Config Library <libraries/config>` method site_url() to accept an array as well.
246   - - Added method ``strip_image_tags()`` to the :doc:`Security Library <libraries/security>`.
247   - - Changed ``_exception_handler()`` to respect php.ini 'display_errors' setting.
248   - - Added possibility to route requests using callback methods.
249   -=======
250 227 - Removed ``CI_CORE`` boolean constant from *CodeIgniter.php* (no longer Reactor and Core versions).
251 228 - :doc:`Loader Library <libraries/loader>` changes include:
252 229 - Added method ``get_vars()`` to the Loader to retrieve all variables loaded with ``$this->load->vars()``.
@@ -275,7 +252,6 @@ Release Date: Not Released
275 252 - Added method ``strip_image_tags()``.
276 253 - Added ``$config['csrf_regeneration']``, which makes token regeneration optional.
277 254 - Added ``$config['csrf_exclude_uris']``, which allows you list URIs which will not have the CSRF validation methods run.
278   ->>>>>>> a7001e968a4791312391eb245ad84888893cda8f
279 255 - Added possibility to route requests using callbacks.
280 256
281 257 Bug fixes for 3.0

0 comments on commit a9a1d25

Please sign in to comment.
Something went wrong with that request. Please try again.