Merge branch 'refs/heads/3.2/master' into 3.2/develop

spadefoot · Oct 22, 2012 · 8b58233 · 8b58233
2 parents 7801c6a + aa81b5c
commit 8b58233
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/classes/base/data.php b/classes/base/data.php
@@ -177,7 +177,7 @@ protected static function unpack($data, $type) {
 		if (is_string($data)) {
 			switch ($type) {
 				case Data::BINARY_DATA:
-					$binary = (preg_match("/^(b'.*'$/i", $data))
+					$binary = (preg_match("/^b'.*'$/i", $data))
 						? substr($data, 2, strlen($data) - 3)
 						: $data;
 					return base_convert($binary, 2, 16);