Index: branches/main/admin/interface/version.php =================================================================== --- branches/main/admin/interface/version.php (revision 14) +++ branches/main/admin/interface/version.php (revision 15) @@ -48,6 +48,6 @@ // check if defined to avoid errors during installation (redirect to admin panel fails if PHP error/warnings are enabled) if(!defined('VERSION')) { define('VERSION', '2.10.1-dev'); } -if(!defined('REVISION')) { define('REVISION', '14'); } +if(!defined('REVISION')) { define('REVISION', '15'); } if(!defined('SP')) { define('SP', ''); } Index: branches/main/modules/output_filter/filters/filterEmail.php =================================================================== --- branches/main/modules/output_filter/filters/filterEmail.php (revision 14) +++ branches/main/modules/output_filter/filters/filterEmail.php (revision 15) @@ -125,19 +125,19 @@ /* ************************************************************************** */ $content ); - } - if ($bNeedMdcr) { - // test if js-decryption is installed - if (!preg_match('/.*<\/head/siU', $content) ) { - // try to insert js-decrypt into if available - $script = str_replace('\\', '/',str_replace(WB_PATH,'', dirname(__DIR__)).'/js/mdcr.js'); - if(is_readable(WB_PATH.$script)) { - $scriptLink = "\t".''."\n"; - $regex = '/(.*)(<\s*?\/\s*?head\s*>.*)/isU'; - $replace = '$1'.$scriptLink.'$2'; - $content = preg_replace ($regex, $replace, $content); + if ($bNeedMdcr) { + // test if js-decryption is installed + if (!preg_match('/.*<\/head/siU', $content) ) { + // try to insert js-decrypt into if available + $script = str_replace('\\', '/',str_replace(WB_PATH,'', dirname(__DIR__)).'/js/mdcr.js'); + if(is_readable(WB_PATH.$script)) { + $scriptLink = "\t".''."\n"; + $regex = '/(.*)(<\s*?\/\s*?head\s*>.*)/isU'; + $replace = '$1'.$scriptLink.'$2'; + $content = preg_replace ($regex, $replace, $content); + } } } + return $content; } - return $content; }