From: Antonio Ospite <ao2@ao2.it>
Date: Fri, 23 Feb 2018 15:10:52 +0000 (+0100)
Subject: Tweeper.php: a more robust fix for 4b9692a19e06f3cf698d23a3854fd34b9914a32a
X-Git-Tag: v1.2.0~2
X-Git-Url: https://git.ao2.it/tweeper.git/commitdiff_plain/78ffdd0963e354dae561414aec7893336928ecc1

Tweeper.php: a more robust fix for 4b9692a19e06f3cf698d23a3854fd34b9914a32a

The "qe" element in the json data is the one containing the problematic
element mentioned in commit 4b9692a19e06f3cf698d23a3854fd34b9914a32a and
it may contain multiple elements with problematic names, so just remove
the "qe" element altogether.
---

diff --git a/src/Tweeper.php b/src/Tweeper.php
index d60e43b..566decb 100644
--- a/src/Tweeper.php
+++ b/src/Tweeper.php
@@ -249,8 +249,11 @@ class Tweeper {
       return NULL;
     }
 
-    // Filter elements which will result in invalid XML element names.
-    $json = str_replace('404_as_react', '_404_as_react', $matches[1]);
+    // The "qe" object contains elements which will result in invalid XML
+    // element names, so remove it.
+    $data = json_decode($matches[1], $assoc = TRUE);
+    unset($data["qe"]);
+    $json = json_encode($data);
 
     return Tweeper::jsonToXml($json, 'instagram');
   }