LPS-46984 SF

xoliveras · Nov 17, 2014 · 94e53c9 · 94e53c9
1 parent 84e3921
commit 94e53c9
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/portal-web/docroot/html/portlet/rss/configuration.jsp b/portal-web/docroot/html/portlet/rss/configuration.jsp
@@ -49,14 +49,15 @@
 			<aui:fieldset cssClass="subscriptions">
 
 				<%
-				String[] titles = rssDisplayContext.getTitles();
 				String[] urls = rssDisplayContext.getURLs();
 
 				if (urls.length == 0) {
 					urls = new String[1];
 					urls[0] = StringPool.BLANK;
 				}
 
+				String[] titles = rssDisplayContext.getTitles();
+
 				for (int i = 0; i < urls.length; i++) {
 					String title = StringPool.BLANK;
 

diff --git a/portal-web/docroot/html/portlet/rss/feed.jspf b/portal-web/docroot/html/portlet/rss/feed.jspf
@@ -55,15 +55,15 @@ SyndFeed syndFeed = rssFeedContext.getSyndFeed();
 			</c:if>
 
 			<%
-			List entries = syndFeed.getEntries();
+			List syndEntries = syndFeed.getEntries();
 			%>
 
-			<c:if test="<%= !entries.isEmpty() %>">
+			<c:if test="<%= !syndEntries.isEmpty() %>">
 				<liferay-ui:panel-container cssClass="feed-entries" extended="<%= false %>" id="rssFeedsPanelContainer" persistState="<%= false %>">
 
 					<%
-					for (int j = 0; (j < entries.size()) && (j < rssDisplayContext.getEntriesPerFeed()); j++) {
-						SyndEntry syndEntry = (SyndEntry)entries.get(j);
+					for (int j = 0; (j < syndEntries.size()) && (j < rssDisplayContext.getEntriesPerFeed()); j++) {
+						SyndEntry syndEntry = (SyndEntry)syndEntries.get(j);
 
 						RSSFeedEntryDisplayContext rssFeedEntryDisplayContext = new RSSFeedEntryDisplayContext(syndEntry, request, rssFeedContext);
 					%>

diff --git a/portal-web/docroot/html/portlet/rss/view.jsp b/portal-web/docroot/html/portlet/rss/view.jsp
@@ -19,8 +19,7 @@
 <div id="<portlet:namespace />feedsContainer">
 
 	<%
-	List<RSSFeedContext> rssFeedContexts =
-		rssDisplayContext.getRSSFeedContexts();
+	List<RSSFeedContext> rssFeedContexts = rssDisplayContext.getRSSFeedContexts();
 
 	for (int i = 0; i < rssFeedContexts.size(); i++) {
 		RSSFeedContext rssFeedContext = rssFeedContexts.get(i);