Skip to content

Commit

Permalink
[ci skip] Fix rendering of literal 'http://' strings in the manual
Browse files Browse the repository at this point in the history
  • Loading branch information
narfbg committed Feb 12, 2018
1 parent a911daa commit 8476056
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions user_guide_src/source/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -1938,7 +1938,7 @@ Hg Tag: v2.0.0
precision.
- Added alpha, and sha1 string types to random_string() in the
:doc:`String Helper <helpers/string_helper>`.
- Modified prep_url() so as to not prepend http&#58;// if the supplied
- Modified prep_url() so as to not prepend \http:// if the supplied
string already has a scheme.
- Modified get_file_info in the file helper, changing filectime()
to filemtime() for dates.
Expand Down Expand Up @@ -2678,7 +2678,7 @@ Bugfixes for 1.6.2
instantiating new Language and Exception objects, and not using the
error heading.
- Fixed a bug (#4413) where a URI containing slashes only e.g.
'http&#58;//example.com/index.php?//' would result in PHP errors
'\http://example.com/index.php?//' would result in PHP errors
- Fixed an array to string conversion error in the Validation library
(#4425)
- Fixed bug (#4451, #4299, #4339) where failed transactions will not
Expand Down
4 changes: 2 additions & 2 deletions user_guide_src/source/helpers/string_helper.rst
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ The following functions are available:
:rtype: string

Converts double slashes in a string to a single slash, except those
found in URL protocol prefixes (e.g. http&#58;//).
found in URL protocol prefixes (e.g. \http://).

Example::

Expand Down Expand Up @@ -220,4 +220,4 @@ The following functions are available:
Removes single and double quotes from a string. Example::

$string = "Joe's \"dinner\"";
$string = strip_quotes($string); //results in "Joes dinner"
$string = strip_quotes($string); //results in "Joes dinner"
4 changes: 2 additions & 2 deletions user_guide_src/source/helpers/url_helper.rst
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ The following functions are available:
be a string or an array.

.. note:: If you are building links that are internal to your application
do not include the base URL (http&#58;//...). This will be added
do not include the base URL (\http://...). This will be added
automatically from the information specified in your config file.
Include only the URI segments you wish appended to the URL.

Expand Down Expand Up @@ -317,7 +317,7 @@ The following functions are available:
:returns: Protocol-prefixed URL string
:rtype: string

This function will add http&#58;// in the event that a protocol prefix
This function will add \http:// in the event that a protocol prefix
is missing from a URL.

Pass the URL string to the function like this::
Expand Down

0 comments on commit 8476056

Please sign in to comment.