Merge pull request #381 from bram85/master

[tt-rss.git] / classes / opml.php

diff --git a/classes/opml.php b/classes/opml.php
index e9a07bb5274a3edd8b2f0bc6da83d1f702241da9..c8c59e8a25448a72bd6caf7fad63526c165249e6 100644 (file)
--- a/classes/opml.php
+++ b/classes/opml.php
@@ -97,7 +97,7 @@ class Opml extends Handler_Protected {
                                $html_url_qpart = "";
                        }
 
-                       $out .= "<outline text=\"$title\" xmlUrl=\"$url\" $html_url_qpart/>\n";
+                       $out .= "<outline type=\"rss\" text=\"$title\" xmlUrl=\"$url\" $html_url_qpart/>\n";
                }
 
                if ($cat_title) $out .= "</outline>\n";
@@ -257,8 +257,8 @@ class Opml extends Handler_Protected {
                $feed_title = $this->dbh->escape_string(mb_substr($attrs->getNamedItem('text')->nodeValue, 0, 250));
                if (!$feed_title) $feed_title = $this->dbh->escape_string(mb_substr($attrs->getNamedItem('title')->nodeValue, 0, 250));
 
-               $feed_url = $this->dbh->escape_string(mb_substr($attrs->getNamedItem('xmlUrl')->nodeValue, 0, 250));
-               if (!$feed_url) $feed_url = $this->dbh->escape_string(mb_substr($attrs->getNamedItem('xmlURL')->nodeValue, 0, 250));
+               $feed_url = $this->dbh->escape_string($attrs->getNamedItem('xmlUrl')->nodeValue);
+               if (!$feed_url) $feed_url = $this->dbh->escape_string($attrs->getNamedItem('xmlURL')->nodeValue);
 
                $site_url = $this->dbh->escape_string(mb_substr($attrs->getNamedItem('htmlUrl')->nodeValue, 0, 250));