Index: branches/5.2.x/core/units/helpers/image_helper.php =================================================================== diff -u -N -r15788 -r16029 --- branches/5.2.x/core/units/helpers/image_helper.php (.../image_helper.php) (revision 15788) +++ branches/5.2.x/core/units/helpers/image_helper.php (.../image_helper.php) (revision 16029) @@ -1,6 +1,6 @@ 0 || $params['max_height'] > 0) { @@ -711,4 +711,4 @@ return $this->Application->prefixRegistred($prefix); } - } \ No newline at end of file + } Index: branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php =================================================================== diff -u -N -r16027 -r16029 --- branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php (.../upload_formatter.php) (revision 16027) +++ branches/5.2.x/core/kernel/utility/formatters/upload_formatter.php (.../upload_formatter.php) (revision 16029) @@ -1,6 +1,6 @@ ResizeImage($file_path, $format); } - catch ( \RuntimeException $e ) { + catch ( RuntimeException $e ) { // error, during image resize -> return empty string return ''; } Index: branches/5.2.x/core/kernel/globals.php =================================================================== diff -u -N -r16027 -r16029 --- branches/5.2.x/core/kernel/globals.php (.../globals.php) (revision 16027) +++ branches/5.2.x/core/kernel/globals.php (.../globals.php) (revision 16029) @@ -1,6 +1,6 @@ fputcsv($data, $delimiter, $enclosure); + $fp = fopen('php://output', 'w'); + fputcsv($fp, $data, $delimiter, $enclosure); + fclose($fp); $ret = ob_get_clean(); if ( $recordSeparator != "\n" ) {