diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-10-10 12:56:38 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-10-10 12:56:38 -0700 |
| commit | b59131f558a6d0fe4c836e2658152c8698f0cd22 (patch) | |
| tree | 1bdbfcb638309a3f8641636b0af45cb8e97bb42c /phpBB | |
| parent | 1f7b0b4a46bda8d297e6e0377dca2c9fc265f8ab (diff) | |
| parent | d024ba9b092843d5c933a2ac3b8b9d1c217be629 (diff) | |
| download | forums-b59131f558a6d0fe4c836e2658152c8698f0cd22.tar forums-b59131f558a6d0fe4c836e2658152c8698f0cd22.tar.gz forums-b59131f558a6d0fe4c836e2658152c8698f0cd22.tar.bz2 forums-b59131f558a6d0fe4c836e2658152c8698f0cd22.tar.xz forums-b59131f558a6d0fe4c836e2658152c8698f0cd22.zip | |
Merge pull request #1763 from bantu/ticket/11901
[ticket/11901] Pass empty string as relative_url for non-local magic URL...
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_content.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 863450a4b2..c5347ef262 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -773,7 +773,8 @@ function make_clickable($text, $server_url = false, $class = 'postlink') { $text = preg_replace_callback($magic_args[0], function($matches) use ($magic_args) { - return make_clickable_callback($magic_args[1], $matches[1], $matches[2], $matches[3], $magic_args[2]); + $relative_url = isset($matches[3]) ? $matches[3] : ''; + return make_clickable_callback($magic_args[1], $matches[1], $matches[2], $relative_url, $magic_args[2]); }, $text); } } |