summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-08-07 10:10:21 +0200
committerAndrey Andreev <narf@devilix.net>2017-08-07 10:10:21 +0200
commitcbe27d76f0aaba7b40f4b23904e4258964bdc50c (patch)
treedf55096db90c7d32b58251526b6b4920be70a958 /user_guide_src
parent32a60d9724c0b810314440c5306a72838299f18a (diff)
[ci skip] Update docs & add changelog entry for PR #5217
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst1
-rw-r--r--user_guide_src/source/libraries/output.rst2
2 files changed, 2 insertions, 1 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index ba789f396..6b75d6296 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -21,6 +21,7 @@ Release Date: Not Released
- Removed previously deprecated :doc:`Config Library <libraries/config>` method ``system_url()`` (encourages insecure practices).
- Changed :doc:`URI Library <libraries/uri>` to ignore the ``$config['url_suffix']``, ``$config['permitted_uri_chars']`` configuration settings for CLI requests.
- Changed :doc:`Loader <libraries/loader>` method ``model()`` to always check if the loaded class extends ``CI_Model``.
+ - Changed :doc:`Output Library <libraries/output>` method ``_display()`` default parameter value to ``NULL`` instead of empty string.
- :doc:`Input Library <libraries/input>` changes include:
diff --git a/user_guide_src/source/libraries/output.rst b/user_guide_src/source/libraries/output.rst
index 92060f66a..bb5493712 100644
--- a/user_guide_src/source/libraries/output.rst
+++ b/user_guide_src/source/libraries/output.rst
@@ -207,7 +207,7 @@ Class Reference
For more information, please see the :doc:`caching documentation <../general/caching>`.
- .. php:method:: _display([$output = ''])
+ .. php:method:: _display([$output = NULL])
:param string $output: Output data override
:returns: void