From 14b1b649cb64bca9853c97a3f1dac1a57d080b2b Mon Sep 17 00:00:00 2001
From: fewieden <fewieden@htwg-konstanz.de>
Date: Mon, 6 Feb 2017 01:19:03 +0100
Subject: [PATCH 1/2] bugfix

---
 modules/default/newsfeed/newsfeed.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js
index aed917f8..7c31717a 100644
--- a/modules/default/newsfeed/newsfeed.js
+++ b/modules/default/newsfeed/newsfeed.js
@@ -112,7 +112,7 @@ Module.register("newsfeed",{
 
 			//Remove selected tags from the beginning of rss feed items (title or description)
 
-			if (this.config.removeStartTags == "title" || "both") {
+			if (this.config.removeStartTags == "title" || this.config.removeStartTags == "both") {
 
 				for (f=0; f<this.config.startTags.length;f++) {
 					if (this.newsItems[this.activeItem].title.slice(0,this.config.startTags[f].length) == this.config.startTags[f]) {
@@ -122,7 +122,7 @@ Module.register("newsfeed",{
 
 			}
 
-			if (this.config.removeStartTags == "description" || "both") {
+			if (this.config.removeStartTags == "description" || this.config.removeStartTags == "both") {
 
 				if (this.config.showDescription) {
 					for (f=0; f<this.config.startTags.length;f++) {

From b35c0f7e398228e35be7f9cdf5a621ab080b19e7 Mon Sep 17 00:00:00 2001
From: fewieden <fewieden@htwg-konstanz.de>
Date: Mon, 6 Feb 2017 02:08:59 +0100
Subject: [PATCH 2/2] update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c6e31e3..4fd18e16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -51,6 +51,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - If units is set to imperial, the showRainAmount option of weatherforecast will show the correct unit.
 - Module currentWeather: check if temperature received from api is defined.
 - Fix an issue with module hidden status changing to `true` although lock string prevented showing it
+- Fix newsfeed module bug (removeStartTags)
 
 ## [2.1.0] - 2016-12-31