mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

- merge r9084 and r9085

Browse Source 
- added tests for make_clickable

git-svn-id: file:///svn/phpbb/trunk@9086 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Nils Adermann
2008-11-22 23:25:57 +00:00
parent 04f7c1da69
commit efe06af913
4 changed files with 165 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/includes/functions_content.php
View File

@@ -496,7 +496,8 @@ function generate_text_for_edit($text, $uid, $flags)
*/
function make_clickable_callback($type, $whitespace, $url, $relative_url, $class)
{
$orig_url = $url . $relative_url;
$orig_url = $url;
$orig_relative = $relative_url;
$append = '';
$url = htmlspecialchars_decode($url);
$relative_url = htmlspecialchars_decode($relative_url);
@@ -561,6 +562,12 @@ function make_clickable_callback($type, $whitespace, $url, $relative_url, $class
$url = substr($url, 0, -1);
}
break;
// set last_char to empty here, so the variable can be used later to
// check whether a character was removed
default:
$last_char = '';
break;
}
$short_url = (strlen($url) > 55) ? substr($url, 0, 39) . ' ... ' . substr($url, -10) : $url;
@@ -578,7 +585,7 @@ function make_clickable_callback($type, $whitespace, $url, $relative_url, $class
// don't touch it and let MAGIC_URL_FULL take care of it.
if (!$relative_url)
{
return $whitespace . $orig_url . '/'; // slash is taken away by relative url pattern
return $whitespace . $orig_url . '/' . $orig_relative; // slash is taken away by relative url pattern
}
break;