Index: branches/2.8.x/CHANGELOG =================================================================== --- branches/2.8.x/CHANGELOG (revision 1551) +++ branches/2.8.x/CHANGELOG (revision 1552) @@ -11,6 +11,9 @@ ! = Update/Change =========================== add small Features 2.8.2 ========================== +31 Dez-2011 Build 1552 Dietmar Woellbrink (Luisehahne) +# fix mdcr.js $scriptLink to absolute url +! change separator breadcrumb admintools 27 Dez-2011 Build 1551 Dietmar Woellbrink (Luisehahne) + add languages vars in languages files + add upload error mesages moduleinstall Index: branches/2.8.x/wb/admin/interface/version.php =================================================================== --- branches/2.8.x/wb/admin/interface/version.php (revision 1551) +++ branches/2.8.x/wb/admin/interface/version.php (revision 1552) @@ -52,5 +52,5 @@ // 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.8.2'); -if(!defined('REVISION')) define('REVISION', '1551'); +if(!defined('REVISION')) define('REVISION', '1552'); if(!defined('SP')) define('SP', 'SP2'); Index: branches/2.8.x/wb/admin/admintools/tool.php =================================================================== --- branches/2.8.x/wb/admin/admintools/tool.php (revision 1551) +++ branches/2.8.x/wb/admin/admintools/tool.php (revision 1552) @@ -35,7 +35,7 @@ print '

'. $HEADING['ADMINISTRATION_TOOLS'].''. - '»'.$toolName.'

'."\n"; + ' » '.$toolName.''."\n"; } // include modules tool.php require(WB_PATH.'/modules/'.$toolDir.'/tool.php'); Index: branches/2.8.x/wb/modules/output_filter/filter-routines.php =================================================================== --- branches/2.8.x/wb/modules/output_filter/filter-routines.php (revision 1551) +++ branches/2.8.x/wb/modules/output_filter/filter-routines.php (revision 1552) @@ -34,14 +34,14 @@ $output_filter_mode |= ($filter_settings['mailto_filter'] * pow(2, 1)); // n | 2^1 define('OUTPUT_FILTER_AT_REPLACEMENT', $filter_settings['at_replacement']); define('OUTPUT_FILTER_DOT_REPLACEMENT', $filter_settings['dot_replacement']); +/* ### filter type: protect email addresses ################################# */ + if( ($output_filter_mode & pow(2, 0)) || ($output_filter_mode & pow(2, 1)) ) { + $content = _doFilterEmail($content, $output_filter_mode); + } /* ### filter type: full qualified URLs ##################################### */ if($filter_settings['sys_rel'] == 1){ $content = _doFilterRelUrl($content); } -/* ### filter type: protect email addresses ################################# */ - if( ($output_filter_mode & pow(2, 0)) || ($output_filter_mode & pow(2, 1)) ) { - $content = _doFilterEmail($content, $output_filter_mode); - } /* ### end of filters ####################################################### */ return $content; } @@ -113,9 +113,9 @@ $output_filter_mode |= pow(2, 2); // n | 2^2 }else { // try to insert js-decrypt into if available - $script = str_replace('\\', '/', dirname(__FILE__)).'/js/mdcr.js'; - if(is_readable($script)) { - $scriptLink = ''; + $script = str_replace('\\', '/',str_replace(WB_PATH,'', dirname(__FILE__)).'/js/mdcr.js'); + if(is_readable(WB_PATH.$script)) { + $scriptLink = ''; $regex = '/(.*)(<\s*?\/\s*?head\s*>.*)/isU'; $replace = '$1'.$scriptLink.'$2'; $content = preg_replace ($regex, $replace, $content);