diff options
author | Bharat Mediratta <bharat@menalto.com> | 2008-12-17 19:28:26 +0000 |
---|---|---|
committer | Bharat Mediratta <bharat@menalto.com> | 2008-12-17 19:28:26 +0000 |
commit | fe396410894f9fcf430e31216312f70db800d96e (patch) | |
tree | fc1222c074e0f8ffd2d952688353f5bf79e360f5 /kohana/helpers/html.php | |
parent | 093fb407a839b1bdacd0cd6036b349a42dcfea7d (diff) |
Update Kohana code to r3799 from their svn head. All tests pass.
Resolved upstream tickets:
http://dev.kohanaphp.com/ticket/972
Command:
svn merge -c19275 vendor/kohana/modified/kohana trunk/kohana
Diffstat (limited to 'kohana/helpers/html.php')
-rw-r--r-- | kohana/helpers/html.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kohana/helpers/html.php b/kohana/helpers/html.php index b11ea755..d1f09612 100644 --- a/kohana/helpers/html.php +++ b/kohana/helpers/html.php @@ -307,7 +307,7 @@ class html_Core { $length = strlen($suffix); - if (substr_compare($href, $suffix, -$length, $length, FALSE) !== 0) + if ( $length > 0 AND substr_compare($href, $suffix, -$length, $length, FALSE) !== 0) { // Add the defined suffix $href .= $suffix; |