diff options
Diffstat (limited to 'user_guide_src/source')
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 | ||||
| -rw-r--r-- | user_guide_src/source/helpers/url_helper.rst | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 6be6084c9..6f08dcb92 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -76,6 +76,7 @@ Release Date: Not Released - Added support (auto-detection) for HTTP/1.1 response code 303 in :php:func:`redirect()`. - Changed :php:func:`redirect()` to only choose the **refresh** method only on IIS servers, instead of all servers on Windows (when **auto** is used). - Changed :php:func:`anchor()`, :php:func:`anchor_popup()`, and :php:func:`redirect()` to support protocol-relative URLs (e.g. *//ellislab.com/codeigniter*). + - Added an optional second parameter to both :php:func:`base_url()` and :php:func:`site_url()` that allows enforcing of a protocol different than the one in the *base_url* configuration setting. - :doc:`HTML Helper <helpers/html_helper>` changes include: diff --git a/user_guide_src/source/helpers/url_helper.rst b/user_guide_src/source/helpers/url_helper.rst index 8b5361f94..7a49f188d 100644 --- a/user_guide_src/source/helpers/url_helper.rst +++ b/user_guide_src/source/helpers/url_helper.rst @@ -18,9 +18,10 @@ The following functions are available: site_url() ========== -.. php:function:: site_url($uri = '') +.. php:function:: site_url($uri = '', $protocol = NULL) :param string $uri: URI string + :param string $protocol: Protocol, e.g. 'http' or 'https' :returns: string Returns your site URL, as specified in your config file. The index.php @@ -51,9 +52,10 @@ please see the :doc:`Config Library <../libraries/config>` documentation. base_url() =========== -.. php:function:: base_url($uri = '') +.. php:function:: base_url($uri = '', $protocol = NULL) :param string $uri: URI string + :param string $protocol: Protocol, e.g. 'http' or 'https' :returns: string Returns your site base URL, as specified in your config file. Example:: |