X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=inc%2Fclasses%2Fmain%2Fcompressor%2Fclass_Bzip2Compressor.php;h=0df4b8081a938ea9b1fb68fe3afc2899ec2cf794;hb=d26e71af1e28dc1429823bdec244df6303f9b2fb;hp=6e9fb8440a8aa7c353a0695d1dd491488922973a;hpb=607a11e2c22949ea0647568c17d62a605595e83b;p=core.git

diff --git a/inc/classes/main/compressor/class_Bzip2Compressor.php b/inc/classes/main/compressor/class_Bzip2Compressor.php
index 6e9fb844..0df4b808 100644
--- a/inc/classes/main/compressor/class_Bzip2Compressor.php
+++ b/inc/classes/main/compressor/class_Bzip2Compressor.php
@@ -2,11 +2,11 @@
 /**
  * BZIP2 compression and decompression class
  *
- * @author		Roland Haeder <webmaster@ship-simu.org>
+ * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
- * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2012 Core Developer Team
+ * @copyright	Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
- * @link		http://www.ship-simu.org
+ * @link		http://www.shipsimu.org
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,9 +33,9 @@ class Bzip2Compressor extends BaseFrameworkSystem implements Compressor {
 	}
 
 	/**
-	 * Create a new compressor channel based a given compression handler
+	 * Create a new compressor channel based a given compression handler or NULL if the required PHP functions are not found.
 	 *
-	 * @return	$compressorInstance		An instance of this class
+	 * @return	$compressorInstance		An instance of this class or NULL if the required PHP functions are not found.
 	 */
 	public static final function createBzip2Compressor () {
 		// Routines not found by default
@@ -55,7 +55,7 @@ class Bzip2Compressor extends BaseFrameworkSystem implements Compressor {
 	 * BZIP2 compression stream
 	 *
 	 * @param	$streamData		Mixed non-object stream data
-	 * @return	$streamData		The compressed stream data	
+	 * @return	$streamData		The compressed stream data
 	 * @throws	InvalidObjectException	If the stream is an object
 	 */
 	public function compressStream ($streamData) {
@@ -72,7 +72,7 @@ class Bzip2Compressor extends BaseFrameworkSystem implements Compressor {
 	 * BZIP2 decompression stream
 	 *
 	 * @param	$streamData		Mixed non-object stream data
-	 * @return	$streamData		The decompressed stream data	
+	 * @return	$streamData		The decompressed stream data
 	 * @throws	InvalidObjectException	If the stream is an object
 	 */
 	public function decompressStream ($streamData) {
@@ -81,14 +81,17 @@ class Bzip2Compressor extends BaseFrameworkSystem implements Compressor {
 			throw new InvalidObjectException($streamData, self::EXCEPTION_UNEXPECTED_OBJECT);
 		} // END - if
 
+		// Decompress it
+		$streamData = bzdecompress($streamData, TRUE);
+
 		// Return the decompressed stream
-		return bzdecompress($streamData);
+		return $streamData;
 	}
 
 	/**
 	 * Getter for the file extension of this compressor
 	 *
-	 * @return	$string		Returns always "bz2"
+	 * @return	$string		Returns always 'bz2'
 	 */
 	public final function getCompressorExtension () {
 		return 'bz2';