// Follow up df2bd6a

shinichi81 · Jan 20, 2015 · 2775957 · 2775957
1 parent df2bd6a
commit 2775957
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/controllers/admin/AdminDashboardController.php b/controllers/admin/AdminDashboardController.php
@@ -352,7 +352,8 @@ public function ajaxProcessGetBlogRss()
 			$articles_limit = 2;
 			foreach ($rss->channel->item as $item)
 			{
-				if ($articles_limit > 0 && Validate::isCleanHtml((string)$item->title) && Validate::isCleanHtml((string)$item->description))
+				if ($articles_limit > 0 && Validate::isCleanHtml((string)$item->title) && Validate::isCleanHtml((string)$item->description)
+					&& isset($item->link) && isset($item->title))
 				{
 					if (in_array($this->context->mode, array(Context::MODE_HOST, Context::MODE_HOST_CONTRIB)))
 						$utm_content = 'cloud';

diff --git a/js/admin/dashboard.js b/js/admin/dashboard.js
@@ -197,7 +197,7 @@ function getBlogRss() {
 		success : function(jsonData) {
 			if (typeof jsonData !== 'undefined' && jsonData !== null && !jsonData.has_errors) {
 				for (var article in jsonData.rss) {
-					var article_html = '<article><h4><a href="'+jsonData.rss[article].link+'" target="_blank" class="_blank">'+jsonData.rss[article].title+'</a></h4><span class="dash-news-date text-muted">'+jsonData.rss[article].date+'</span><p>'+jsonData.rss[article].short_desc+' <a href="'+jsonData.rss[article].link+'">'+read_more+'</a><p></article><hr/>';
+					var article_html = '<article><h4><a href="'+jsonData.rss[article].link+'" class="_blank" onclick="return !window.open(this.href);">'+jsonData.rss[article].title+'</a></h4><span class="dash-news-date text-muted">'+jsonData.rss[article].date+'</span><p>'+jsonData.rss[article].short_desc+' <a href="'+jsonData.rss[article].link+'">'+read_more+'</a><p></article><hr/>';
 					$('.dash_news .dash_news_content').append(article_html);
 				}
 			}