Merge branch 'master' of github.com:WoltLab/com.woltlab.wcf.exporter

Conflicts:
	files/lib/system/exporter/IPB3xExporter.class.php

diff --cc files/lib/system/exporter/IPB3xExporter.class.php
index e611a9b738f29ddbdbebcf27c00660cae83fc52f,9430615ff940ad9a832bd1e6e8e88cae538cf3e3..3117babafaedb9f74e78fa09b11a9583c66b1ca2
--- 1/files/lib/system/exporter/IPB3xExporter.class.php
--- 2/files/lib/system/exporter/IPB3xExporter.class.php
+++ b/files/lib/system/exporter/IPB3xExporter.class.php
@@@ -1057,15 -1058,4 +1058,15 @@@ class IPB3xExporter extends AbstractExp
  
                return $string;
        }
- }
 +      
 +      private static function fixStatusUpdate($string) {
 +              // <br /> to newline
 +              $string = str_ireplace('<br />', "\n", $string);
 +              $string = str_ireplace('<br>', "\n", $string);
 +              
 +              // decode html entities
 +              $string = StringUtil::decodeHTML($string);
 +              
 +              return $string;
 +      }
+ }