From 87fa0736ae92217f6abc5d31718dda35a051955b Mon Sep 17 00:00:00 2001
From: Alex Barth <alex_b@53995.no-reply.drupal.org>
Date: Mon, 18 Jan 2010 19:20:40 +0000
Subject: [PATCH] Decode HTML entities for title and author name in
FeedsSimplePieParser.
---
plugins/FeedsSimplePieParser.inc | 8 ++++----
tests/feeds.test | 12 ++++++------
tests/feeds/developmentseed.rss2 | 4 ++--
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/plugins/FeedsSimplePieParser.inc b/plugins/FeedsSimplePieParser.inc
index 3cae8cf0..650bb189 100644
--- a/plugins/FeedsSimplePieParser.inc
+++ b/plugins/FeedsSimplePieParser.inc
@@ -41,7 +41,7 @@ class FeedsSimplePieParser extends FeedsParser {
*/
public function parse(FeedsImportBatch $batch, FeedsSource $source) {
feeds_include_library('simplepie.inc', 'simplepie');
-
+
// Initialize SimplePie.
$parser = new SimplePie();
$parser->set_raw_data($batch->getRaw());
@@ -53,7 +53,7 @@ class FeedsSimplePieParser extends FeedsParser {
$parser->init();
// Construct the standard form of the parsed feed
- $batch->setTitle(($title = $parser->get_title()) ? $title : $this->createTitle($parser->get_description()));
+ $batch->setTitle(html_entity_decode(($title = $parser->get_title()) ? $title : $this->createTitle($parser->get_description())));
$batch->setDescription($parser->get_description());
$batch->setLink(html_entity_decode($parser->get_link()));
@@ -61,7 +61,7 @@ class FeedsSimplePieParser extends FeedsParser {
for ($i = 0; $i < $items_num; $i++) {
$item = array();
$simplepie_item = $parser->get_item($i);
- $item['title'] = ($title = $simplepie_item->get_title()) ? $title : $this->createTitle($simplepie_item->get_content());
+ $item['title'] = html_entity_decode(($title = $simplepie_item->get_title()) ? $title : $this->createTitle($simplepie_item->get_content()));
$item['description'] = $simplepie_item->get_content();
$item['url'] = html_entity_decode($simplepie_item->get_link());
// Use UNIX time. If no date is defined, fall back to FEEDS_REQUEST_TIME.
@@ -75,7 +75,7 @@ class FeedsSimplePieParser extends FeedsParser {
$item['guid'] = $item['url'];
}
$author = $simplepie_item->get_author();
- $item['author_name'] = $author->name;
+ $item['author_name'] = html_entity_decode($author->name);
$item['author_link'] = $author->link;
$item['author_email'] = $author->email;
// Enclosures
diff --git a/tests/feeds.test b/tests/feeds.test
index ab9a43a1..83df9ab7 100644
--- a/tests/feeds.test
+++ b/tests/feeds.test
@@ -96,7 +96,7 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$this->drupalGet('node');
$this->assertText('Open Atrium Translation Workflow: Two Way Translation Updates');
$this->assertText('Tue, 10/06/2009');
- $this->assertText('A new translation process for Open Atrium and integration with Localize Drupal');
+ $this->assertText('A new translation process for Open Atrium & integration with Localize Drupal');
$this->assertText('Week in DC Tech: October 5th Edition');
$this->assertText('Mon, 10/05/2009');
$this->assertText('There are some great technology events happening this week');
@@ -118,7 +118,7 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$this->assertText('Week in DC Tech: September 21 Edition');
$this->assertText('Mon, 09/21/2009');
$this->assertText('an interesting variety of technology events happening in Washington, DC ');
- $this->assertText('s Software Freedom Day: Impressions and Photos');
+ $this->assertText('s Software Freedom Day: Impressions & Photos');
$this->assertText('Mon, 09/21/2009');
$this->assertText('Presenting on Features in Drupal and Open Atrium');
$this->assertText('Scaling the Open Atrium UI');
@@ -237,7 +237,7 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$this->drupalGet('node');
$this->assertText('Open Atrium Translation Workflow: Two Way Translation Updates');
$this->assertText('Tue, 10/06/2009');
- $this->assertText('A new translation process for Open Atrium and integration with Localize Drupal');
+ $this->assertText('A new translation process for Open Atrium & integration with Localize Drupal');
$this->assertText('Week in DC Tech: October 5th Edition');
$this->assertText('Mon, 10/05/2009');
$this->assertText('There are some great technology events happening this week');
@@ -259,7 +259,7 @@ class FeedsRSStoNodesTest extends FeedsWebTestCase {
$this->assertText('Week in DC Tech: September 21 Edition');
$this->assertText('Mon, 09/21/2009');
$this->assertText('an interesting variety of technology events happening in Washington, DC ');
- $this->assertText('s Software Freedom Day: Impressions and Photos');
+ $this->assertText('s Software Freedom Day: Impressions & Photos');
$this->assertText('Mon, 09/21/2009');
$this->assertText('Presenting on Features in Drupal and Open Atrium');
$this->assertText('Scaling the Open Atrium UI');
@@ -430,7 +430,7 @@ class FeedsRSStoDataTest extends FeedsWebTestCase {
// Assert accuracy of aggregated information.
$this->drupalGet('admin/content/data/view/feeds_data_rss');
$this->assertText('Open Atrium Translation Workflow: Two Way Translation Updates');
- $this->assertText('A new translation process for Open Atrium and integration with Localize Drupal');
+ $this->assertText('A new translation process for Open Atrium & integration with Localize Drupal');
$this->assertText('Week in DC Tech: October 5th Edition');
$this->assertText('There are some great technology events happening this week');
$this->assertText('Mapping Innovation at the World Bank with Open Atrium');
@@ -445,7 +445,7 @@ class FeedsRSStoDataTest extends FeedsWebTestCase {
$this->assertText('In addition to authentication, the Siteminder system');
$this->assertText('Week in DC Tech: September 21 Edition');
$this->assertText('an interesting variety of technology events happening in Washington, DC ');
- $this->assertText('s Software Freedom Day: Impressions and Photos');
+ $this->assertText('s Software Freedom Day: Impressions & Photos');
$this->assertText('Presenting on Features in Drupal and Open Atrium');
$this->assertText('Scaling the Open Atrium UI');
$this->assertText('The first major change is switching');
diff --git a/tests/feeds/developmentseed.rss2 b/tests/feeds/developmentseed.rss2
index 977f2bb2..90f5deaf 100644
--- a/tests/feeds/developmentseed.rss2
+++ b/tests/feeds/developmentseed.rss2
@@ -10,7 +10,7 @@
<description><div class="field field-type-text field-field-subtitle">
<div class="field-items">
<div class="field-item odd">
- <p>A new translation process for Open Atrium and integration with Localize Drupal</p> </div>
+ <p>A new translation process for Open Atrium & integration with Localize Drupal</p> </div>
</div>
</div>
<div class='node-body'><p>The <a href="http://openatrium.com/">Open Atrium</a> <a href="http://developmentseed.org/blog/2009/jul/16/open-atrium-solving-translation-puzzle">translation infrastructure</a> (and Drupal translations in general) are progressing quickly. For Open Atrium to be well translated we first need Drupal's modules to be translated, so I am splitting efforts at the moment between helping with <a href="http://localize.drupal.org">Localize Drupal</a> and improving <a href="https://translate.openatrium.com">Open Atrium Translate</a>. Already, it is much easier to automatically download your language, get updates from a translation server, protect locally translated strings, and scale the translation system so that translation servers can talk to each other.</p>
@@ -240,7 +240,7 @@
<guid isPermaLink="false">968 at http://developmentseed.org</guid>
</item>
<item>
- <title>Peru's Software Freedom Day: Impressions and Photos</title>
+ <title>Peru's Software Freedom Day: Impressions & Photos</title>
<link>http://developmentseed.org/blog/2009/sep/21/perus-software-freedom-day-impressions-and-photos</link>
<description><div class='node-body'><p>There was a great turn out a <a href="http://www.sfdperu.org/">Software Freedom Day</a> this weekend with 400 people in attendance and a solid 30 presentations. The <a href="http://developmentseed.org/blog/2009/sep/15/preparing-perus-software-freedom-day-talks-drupal-features-and-open-atrium">presentations in the Drupal track</a> were some of the best attended sessions of the day. To get a sense of Drupal's traction down here, "Drupal" was mentioned in many sessions and conversations throughout the day, and not just by the people working directly with Drupal.</p>
--
GitLab