Navigation

Changeset 1788

Timestamp:

08/27/08 19:27:50 (3 months ago)

Author:

mikey

Message:

fix output encoding on windows command line

Files:

r1765	r1788
48	48	if (null === self::$out) {
49	49	self::$out = new self(STDOUT);
50		$outputEncoding = ~~iconv_get_encoding('output_encoding'~~);
	50	$outputEncoding = self::getOutputEncoding();
51	51	if ('UTF-8' !== $outputEncoding) {
52	52	stubClassLoader::load('net::stubbles::streams::stubEncodingOutputStream');
…	…
67	67	if (null === self::$err) {
68	68	self::$err = new self(STDERR);
69		$outputEncoding = ~~iconv_get_encoding('output_encoding'~~);
	69	$outputEncoding = self::getOutputEncoding();
70	70	if ('UTF-8' !== $outputEncoding) {
71	71	stubClassLoader::load('net::stubbles::streams::stubEncodingOutputStream');
…	…
76	76	return self::$err;
77	77	}
	78
	79	/**
	80	* helper method to detect correct output encoding
	81	*
	82	* @return unknown
	83	*/
	84	protected static function getOutputEncoding()
	85	{
	86	$outputEncoding = iconv_get_encoding('output_encoding');
	87	if ('CP1252' === $outputEncoding && DIRECTORY_SEPARATOR !== '/') {
	88	$outputEncoding = 'CP850';
	89	}
	90
	91	return $outputEncoding;
	92	}
78	93	}
79	94	?>