From 4efbdf8631f3347c5c03e70d80ef7ee009f39449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Tue, 6 Apr 2021 16:41:02 +0800
Subject: [PATCH] add clear

---
 wchat/common/Help.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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);