diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2010-10-03 11:54:20 +0400 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2010-10-03 11:54:20 +0400 |
| commit | 3b3a199df86b1c94d16e6c0f601e3988df37070f (patch) | |
| tree | d7ee21ee3595115bd757d2ca9d978c2a77ddac2d /modules | |
| parent | 66438f2922dad7b3a6d36bc22a06b3566fd9becf (diff) | |
| parent | 5ba53dde355add2f6098887611b5d2a7eb32b44b (diff) | |
Merge branch 'master' of madoka.volgo-balt.ru:public_html/testbox/tt-rss
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/opml_domdoc.php | 4 | ||||
| -rw-r--r-- | modules/opml_domxml.php | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/modules/opml_domdoc.php b/modules/opml_domdoc.php index a1efb1e93..08715093a 100644 --- a/modules/opml_domdoc.php +++ b/modules/opml_domdoc.php @@ -37,6 +37,10 @@ } $feed_url = db_escape_string($outline->attributes->getNamedItem('xmlUrl')->nodeValue); + + if (!$feed_url) + $feed_url = db_escape_string($outline->attributes->getNamedItem('xmlURL')->nodeValue); + $site_url = db_escape_string($outline->attributes->getNamedItem('htmlUrl')->nodeValue); $pref_name = db_escape_string($outline->attributes->getNamedItem('pref-name')->nodeValue); diff --git a/modules/opml_domxml.php b/modules/opml_domxml.php index 1cc1467a8..8262c3040 100644 --- a/modules/opml_domxml.php +++ b/modules/opml_domxml.php @@ -39,6 +39,10 @@ } $feed_url = db_escape_string($outline->get_attribute('xmlUrl')); + + if (!$feed_url) + $feed_url = db_escape_string($outline->get_attribute('xmlURL')); + $site_url = db_escape_string($outline->get_attribute('htmlUrl')); if ($cat_title && !$feed_url) { |