1
0
mirror of https://github.com/e107inc/e107.git synced 2025-08-17 20:01:47 +02:00

Merge remote-tracking branch 'origin/master'

This commit is contained in:
SecretR
2014-11-18 21:39:10 +02:00
14 changed files with 172 additions and 49 deletions

View File

@@ -1618,7 +1618,7 @@ class e_parse extends e_parser
// Convert URL's to clickable links, unless modifiers or prefs override
if ($opts['link_click'])
{
if ($opts['link_replace'])
if ($opts['link_replace'] && ADMIN_AREA !== true)
{
$_ext = ($pref['links_new_window'] ? " rel=\"external\"" : "");
$link_text = $pref['link_text'];