summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@bofh.bg>2012-10-06 19:43:47 +0200
committerAndrey Andreev <narf@bofh.bg>2012-10-06 19:43:47 +0200
commit956631d2b8f0f1173f55134b8465b41d2018edfa (patch)
tree09cfa29116713be21bec560b10f02a9cf2aec5bc
parentdc9bfb7ffbbd53fa4ad0c22c8c42300dd882ecca (diff)
[ci skip] Alter some changelog entries
-rw-r--r--user_guide_src/source/changelog.rst11
-rw-r--r--user_guide_src/source/libraries/output.rst3
2 files changed, 9 insertions, 5 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 486a67696..87b01743e 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -218,7 +218,12 @@ Release Date: Not Released
- CI_Loader::_ci_autoloader() is now a protected method.
- Added autoloading of drivers with $autoload['drivers'].
- CI_Loader::library() will now load drivers as well, for backward compatibility of converted libraries (like Session).
- - ``is_loaded()`` function from *system/core/Commons.php* now returns a reference.
+ - :doc:`Common functions <general/common_functions>` changes include:
+ - ``is_loaded()`` function now returns a reference.
+ - Added ``get_mimes()`` function to return the *config/mimes.php* array.
+ - Added support for HTTP code 303 ("See Other") in ``set_status_header()``.
+ - Removed redundant conditional to determine HTTP server protocol in ``set_status_header()``.
+ - Changed ``_exception_handler()`` to respect php.ini *display_errors* setting.
- $config['rewrite_short_tags'] now has no effect when using PHP 5.4 as *<?=* will always be available.
- Added ``method()`` to the :doc:`Input Library <libraries/input>` to retrieve ``$_SERVER['REQUEST_METHOD']``.
- Modified valid_ip() to use PHP's filter_var() in the :doc:`Input Library <libraries/input>`.
@@ -227,16 +232,12 @@ Release Date: Not Released
- :doc:`Output Library <libraries/output>` changes include:
- Added method ``get_content_type()``.
- Added a second argument to method ``set_content_type()`` that allows setting the document charset as well.
- - Added ``get_mimes()`` function to *system/core/Commons.php* to return the *config/mimes.php* array.
- ``$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 <libraries/config>` method ``site_url()`` to accept an array as well.
- :doc:`Security Library <libraries/security>` changes include:
- Added method ``strip_image_tags()``.
- Added ``$config['csrf_regeneration']``, which makes token regeneration optional.
- Added ``$config['csrf_exclude_uris']``, which allows you list URIs which will not have the CSRF validation methods run.
- - Changed ``_exception_handler()`` to respect php.ini 'display_errors' setting.
- - Removed redundant conditional to determine HTTP server protocol in ``set_status_header()``.
- Added support for IPv4 range masks (e.g. 192.168.1.1/24) to specify ranges of IP addresses for use with the *proxy_ips* setting.
Bug fixes for 3.0
diff --git a/user_guide_src/source/libraries/output.rst b/user_guide_src/source/libraries/output.rst
index 0472d14cf..3289a241f 100644
--- a/user_guide_src/source/libraries/output.rst
+++ b/user_guide_src/source/libraries/output.rst
@@ -105,6 +105,9 @@ Permits you to manually set a server status header. Example::
`See here <http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html>`_ for
a full list of headers.
+.. note:: This method is an alias for :doc:`Common function <../general/common_funtions.rst>`
+ ``set_status_header()``.
+
$this->output->enable_profiler();
==================================