Merge pull request #71 from mcd-php/patch-1

raveren · raveren · commit 7220259ffb22 · 2013-06-17T12:29:28.000-07:00
FIX: Crash on @thobbs/phpcassa objects with UUIDs
diff --git a/parsers/parser.class.php b/parsers/parser.class.php
@@ -508,7 +508,7 @@ protected static function _detectEncoding( $value )
 		}
 
 		if ( empty( Kint::$charEncodings ) || !function_exists( 'iconv' ) ) {
-			return isset( $mbDetected ) ? $mbDetected : 'UTF-8';
+			return !empty( $mbDetected ) ? $mbDetected : 'UTF-8';
 		}
 
 		$md5 = md5( $value );
@@ -568,4 +568,4 @@ protected static function _substr( $string, $end, $encoding = null )
 			? mb_substr( $string, 0, $end, $encoding )
 			: substr( $string, 0, $end );
 	}
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -508,7 +508,7 @@ protected static function _detectEncoding( $value )`
`508`	`508`	`}`
`509`	`509`
`510`	`510`	`if ( empty( Kint::$charEncodings ) \|\| !function_exists( 'iconv' ) ) {`
`511`		`- return isset( $mbDetected ) ? $mbDetected : 'UTF-8';`
	`511`	`+ return !empty( $mbDetected ) ? $mbDetected : 'UTF-8';`
`512`	`512`	`}`
`513`	`513`
`514`	`514`	`$md5 = md5( $value );`
`@@ -568,4 +568,4 @@ protected static function _substr( $string, $end, $encoding = null )`
`568`	`568`	`? mb_substr( $string, 0, $end, $encoding )`
`569`	`569`	`: substr( $string, 0, $end );`
`570`	`570`	`}`
`571`		`-}`
	`571`	`+}`