From ae8cfe3176dd6908aee54b0c917be8eb4949be1a Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 8 Sep 2005 20:08:42 +0000
Subject: - Patch #13941 by Prometheus6: Atom parser improvements.

---
 modules/aggregator.module            | 9 ++++++++-
 modules/aggregator/aggregator.module | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/aggregator.module b/modules/aggregator.module
index b4656573e..2f7498d19 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -289,9 +289,12 @@ function aggregator_element_start($parser, $name, $attributes) {
     case 'SUBTITLE':
     case 'LOGO':
     case 'INFO':
-    case 'ID':
       $element = $name;
       break;
+    case 'ID':
+      if ($element != 'ITEM') {
+        $element = $name;
+      }
     case 'LINK':
       if ($attributes['REL'] == 'alternate') {
         if ($element == 'ITEM') {
@@ -328,10 +331,14 @@ function aggregator_element_end($parser, $name) {
     case 'ENTRY':
     case 'CONTENT':
     case 'INFO':
+      $element = '';
+      break;
     case 'ID':
+      if ($element == 'ID') {
       $element = '';
   }
 }
+}
 
 /**
  * Call-back function used by the XML parser.
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index b4656573e..2f7498d19 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -289,9 +289,12 @@ function aggregator_element_start($parser, $name, $attributes) {
     case 'SUBTITLE':
     case 'LOGO':
     case 'INFO':
-    case 'ID':
       $element = $name;
       break;
+    case 'ID':
+      if ($element != 'ITEM') {
+        $element = $name;
+      }
     case 'LINK':
       if ($attributes['REL'] == 'alternate') {
         if ($element == 'ITEM') {
@@ -328,10 +331,14 @@ function aggregator_element_end($parser, $name) {
     case 'ENTRY':
     case 'CONTENT':
     case 'INFO':
+      $element = '';
+      break;
     case 'ID':
+      if ($element == 'ID') {
       $element = '';
   }
 }
+}
 
 /**
  * Call-back function used by the XML parser.
-- 
cgit v1.2.3