diff --git a/wchat/common/Help.php b/wchat/common/Help.php index 2d8799a..ff09378 100644 --- a/wchat/common/Help.php +++ b/wchat/common/Help.php @@ -62,9 +62,12 @@ class Help extends Miniprogarampage if (is_array($xml)) { return $xml; } - $matchQoute = '/(<\?xml.*?\?>)?<([a-zA-Z_]+)>(<([a-zA-Z_]+)><\/\4>)+<\/\2>/'; - if (!preg_match($matchQoute, $xml)) { - return self::jsonToArray($xml); +/* $matchQoute = '/(<\?xml.*?\?>)?<([a-zA-Z_]+)>(<([a-zA-Z_]+)><\/\4>)+<\/\2>/';*/ +// if (!preg_match($matchQoute, $xml)) { +// return self::jsonToArray($xml); +// } + if (!is_null($data = json_decode($xml, true))) { + return $data; } try { $data = @simplexml_load_string($xml, 'SimpleXMLElement', LIBXML_NOCDATA);