Fix bugs in import/export

- EntryDAO.php: add a missing "FreshRSS_EntryDAO::"
- Fix htmlspecialchars in opml export

2 files changed, 6 insertions, 4 deletions

diff --git a/app/Models/EntryDAO.php b/app/Models/EntryDAO.php
index 8c001e73b..74b5306e9 100644
--- a/app/Models/EntryDAO.php
+++ b/app/Models/EntryDAO.php
@@ -17,7 +17,9 @@ class FreshRSS_EntryDAO extends Minz_ModelPdo {
 	}
 
 	public function addEntry($valuesTmp, $preparedStatement = null) {
-		$stm = $preparedStatement === null ? addEntryPrepare() : $preparedStatement;
+		$stm = $preparedStatement === null ?
+				FreshRSS_EntryDAO::addEntryPrepare() :
+				$preparedStatement;
 
 		$values = array(
 			$valuesTmp['id'],
diff --git a/app/views/helpers/export/opml.phtml b/app/views/helpers/export/opml.phtml
index f667d093c..8622d9144 100644
--- a/app/views/helpers/export/opml.phtml
+++ b/app/views/helpers/export/opml.phtml
@@ -18,9 +18,9 @@ foreach ($this->categories as $key => $cat) {
 		$opml_array['body'][$key]['@outlines'][] = array(
 			'text' => htmlspecialchars_decode($feed->name()),
 			'type' => 'rss',
-			'xmlUrl' => $feed->url(),
-			'htmlUrl' => $feed->website(),
-			'description' => $feed->description()
+			'xmlUrl' => htmlspecialchars_decode($feed->url()),
+			'htmlUrl' => htmlspecialchars_decode($feed->website()),
+			'description' => htmlspecialchars_decode($feed->description()),
 		);
 	}
 }