Merge branch 'OpenOLAT_12.5' of...

Merge branch 'OpenOLAT_12.5' of ssh://uhensler@office.frentix.com/home/uhensler/repositories/OpenOLAT.git

src/main/java/org/olat/modules/webFeed/manager/FeedNotifications.java

@@ -98,15 +98,10 @@ public class FeedNotifications {
 	
 	private void createSubscriptionItem(Item item, Publisher p){
 		Date modDate = item.getPublishDate();
-		if (compareDate.before(modDate)) {
+		if (item.isPublished() && compareDate.before(modDate)) {
 			String title = item.getTitle();
 			String author = item.getAuthor();
-			String desc;
-			if (item.isDraft()) {
-				return;
-			} else {
-				desc = translator.translate("notifications.entry", new String[] { title, author });
-			}
+			String desc = translator.translate("notifications.entry", new String[] { title, author });
 			String businessPath = p.getBusinessPath();
 			String urlToSend = BusinessControlFactory.getInstance()
 					.getURLFromBusinessPathString(businessPath);

src/main/java/org/olat/modules/webFeed/manager/FeedNotificationsHandler.java

@@ -137,7 +137,7 @@ public abstract class FeedNotificationsHandler implements NotificationsHandler {
 					.getURLFromBusinessPathString(businessPath);
 		String iconCssClass = item.extraCSSClass();
 		Date publishDate = item.getPublishDate();
-		if(publishDate != null) {
+		if(item.isPublished()) {
 			if(compareDate.before(publishDate)) {
 				String desc = translator.translate("notifications.entry.published", new String[] { title, author });
 				items.add(new SubscriptionListItem(desc, urlToSend, businessPath, publishDate, iconCssClass));