diff options
| author | Dries Buytaert <dries@buytaert.net> | 2005-09-08 20:08:42 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2005-09-08 20:08:42 +0000 |
| commit | ae8cfe3176dd6908aee54b0c917be8eb4949be1a (patch) | |
| tree | dbb6ce29a6f7903e1b370638f6e234b57634e1f9 | |
| parent | 274c44c6ffc62d622a1594e3b81344c4e87db1a9 (diff) | |
| download | brdo-ae8cfe3176dd6908aee54b0c917be8eb4949be1a.tar.gz brdo-ae8cfe3176dd6908aee54b0c917be8eb4949be1a.tar.bz2 | |
- Patch #13941 by Prometheus6: Atom parser improvements.
| -rw-r--r-- | modules/aggregator.module | 9 | ||||
| -rw-r--r-- | modules/aggregator/aggregator.module | 9 |
2 files changed, 16 insertions, 2 deletions
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. |