Skip to content

Commit 0eb0fca

Browse files
authored
Merge pull request #7197 from kenjis/fix-docs-url_helper.rst
docs: improve url_helper.rst
2 parents 53495a3 + b2ffe41 commit 0eb0fca

1 file changed

Lines changed: 15 additions & 12 deletions

File tree

user_guide_src/source/helpers/url_helper.rst

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,10 @@ The following functions are available:
116116

117117
Returns the full URL (including segments) of the page the user was previously on.
118118

119-
.. note:: Due to security issues of blindly trusting the HTTP_REFERER system variable, CodeIgniter will
119+
.. note:: Due to security issues of blindly trusting the ``HTTP_REFERER`` system variable, CodeIgniter will
120120
store previously visited pages in the session if it's available. This ensures that we always
121121
use a known and trusted source. If the session hasn't been loaded, or is otherwise unavailable,
122-
then a sanitized version of HTTP_REFERER will be used.
122+
then a sanitized version of ``HTTP_REFERER`` will be used.
123123

124124
.. php:function:: uri_string()
125125
@@ -151,7 +151,7 @@ The following functions are available:
151151
.. php:function:: index_page([$altConfig = null])
152152
153153
:param \\Config\\App $altConfig: Alternate configuration to use
154-
:returns: 'index_page' value
154+
:returns: The ``indexPage`` value
155155
:rtype: string
156156

157157
Returns your site **indexPage**, as specified in your config file.
@@ -180,7 +180,7 @@ The following functions are available:
180180
be a string or an array.
181181

182182
.. note:: If you are building links that are internal to your application
183-
do not include the base URL (`http://...`). This will be added
183+
do not include the base URL (``http://...``). This will be added
184184
automatically from the information specified in your config file.
185185
Include only the URI segments you wish appended to the URL.
186186

@@ -304,12 +304,12 @@ The following functions are available:
304304

305305
.. literalinclude:: url_helper/016.php
306306

307-
.. note:: The only URLs recognized are those that start with "www." or with "://".
307+
.. note:: The only URLs recognized are those that start with ``www.`` or with ``://``.
308308

309309
.. php:function:: url_title($str[, $separator = '-'[, $lowercase = false]])
310310
311311
:param string $str: Input string
312-
:param string $separator: Word separator (usually '-' or '_')
312+
:param string $separator: Word separator (usually ``'-'`` or ``'_'``)
313313
:param bool $lowercase: Whether to transform the output string to lowercase
314314
:returns: URL-formatted string
315315
:rtype: string
@@ -321,7 +321,7 @@ The following functions are available:
321321
.. literalinclude:: url_helper/017.php
322322

323323
The second parameter determines the word delimiter. By default dashes
324-
are used. Preferred options are: **-** (dash) or **_** (underscore).
324+
are used. Preferred options are: ``-`` (dash) or ``_`` (underscore).
325325

326326
Example:
327327

@@ -337,7 +337,7 @@ The following functions are available:
337337
.. php:function:: mb_url_title($str[, $separator = '-'[, $lowercase = false]])
338338
339339
:param string $str: Input string
340-
:param string $separator: Word separator (usually '-' or '_')
340+
:param string $separator: Word separator (usually ``'-'`` or ``'_'``)
341341
:param bool $lowercase: Whether to transform the output string to lowercase
342342
:returns: URL-formatted string
343343
:rtype: string
@@ -348,11 +348,11 @@ The following functions are available:
348348
.. php:function:: prep_url([$str = ''[, $secure = false]])
349349
350350
:param string $str: URL string
351-
:param boolean $secure: true for https://
351+
:param boolean $secure: true for ``https://``
352352
:returns: Protocol-prefixed URL string
353353
:rtype: string
354354

355-
This function will add *http://* or *https://* in the event that a protocol prefix
355+
This function will add ``http://`` or ``https://`` in the event that a protocol prefix
356356
is missing from a URL.
357357

358358
Pass the URL string to the function like this:
@@ -388,14 +388,17 @@ The following functions are available:
388388

389389
.. php:function:: url_is($path)
390390
391-
:param string $path: The path to check the current URI path against.
391+
:param string $path: The URL path relative to baseURL to check the current URI path against.
392392
:rtype: boolean
393393

394394
Compares the current URL's path against the given path to see if they match. Example:
395395

396396
.. literalinclude:: url_helper/023.php
397397

398-
This would match ``http://example.com/admin``. You can use the ``*`` wildcard to match
398+
This would match **http://example.com/admin**. It would match **http://example.com/subdir/admin**
399+
if your baseURL is ``http://example.com/subdir/``.
400+
401+
You can use the ``*`` wildcard to match
399402
any other applicable characters in the URL:
400403

401404
.. literalinclude:: url_helper/024.php

0 commit comments

Comments
 (0)