From 06612e35e433109e00167ac62d65299210ef0032 Mon Sep 17 00:00:00 2001
From: James Walker <walkah@walkah.net>
Date: Tue, 9 Mar 2010 18:47:20 -0500
Subject: remove hard-coded me:env check in magicenvelope

---
 plugins/OStatus/lib/magicenvelope.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'plugins/OStatus/lib/magicenvelope.php')

diff --git a/plugins/OStatus/lib/magicenvelope.php b/plugins/OStatus/lib/magicenvelope.php
index e8835165c..c927209e4 100644
--- a/plugins/OStatus/lib/magicenvelope.php
+++ b/plugins/OStatus/lib/magicenvelope.php
@@ -193,11 +193,12 @@ class MagicEnvelope
 
     public function fromDom($dom)
     {
-        if ($dom->documentElement->tagName == 'entry') {
+        $env_element = $dom->getElementsByTagNameNS(MagicEnvelope::NS, 'env')->item(0);
+        if (!$env_element) {
             $env_element = $dom->getElementsByTagNameNS(MagicEnvelope::NS, 'provenance')->item(0);
-        } else if ($dom->documentElement->tagName == 'me:env') {
-            $env_element = $dom->documentElement;
-        } else {
+        }
+
+        if (!$env_element) {
             return false;
         }
 
-- 
cgit v1.2.3-54-g00ecf