RE: [xwiki-commits] r1796 - xwiki/branches/XWIKI_1_0_BETA_1/core/src/main/java/com/xpn/xwiki/render/macro/rss
Hi Ludovic, I see you've just committed code in the 1.0 BETA 1 branch... I don't think this is right :-) Actually this branch needs to be closed. We already have a tag for 1.0 BETA 1. Could you please recommit this to trunk? We've agreed to work on trunk till B2 is released and swithc to a 1.0 branch when we promote it to RC1. Thanks -Vincent
-----Original Message----- From: Ludovic Dubost [mailto:[email protected]] Sent: vendredi 22 décembre 2006 15:11 To: [email protected] Subject: [xwiki-commits] r1796 - xwiki/branches/XWIKI_1_0_BETA_1/core/src/main/java/com/xpn/xwiki/render /macro/rss
Author: ludovic Date: 2006-12-22 15:10:31 +0100 (Fri, 22 Dec 2006) New Revision: 1796
Modified:
xwiki/branches/XWIKI_1_0_BETA_1/core/src/main/java/com/xpn/xwiki/render /macro/rss/RSSMacro.java Log: XWIKI-283 Fix RssMacro because of changes in Rome
Modified: xwiki/branches/XWIKI_1_0_BETA_1/core/src/main/java/com/xpn/xwiki/render /macro/rss/RSSMacro.java =================================================================== --- xwiki/branches/XWIKI_1_0_BETA_1/core/src/main/java/com/xpn/xwiki/render /macro/rss/RSSMacro.java 2006-12-22 02:34:37 UTC (rev 1795) +++ xwiki/branches/XWIKI_1_0_BETA_1/core/src/main/java/com/xpn/xwiki/render /macro/rss/RSSMacro.java 2006-12-22 14:10:31 UTC (rev 1796) @@ -181,7 +181,7 @@ if (paramObj.isFull() && entry.getDescription() != null) { buf.append(NEWLINE).append("{quote}") - .append(NEWLINE).append(entry.getDescription()) + + .append(NEWLINE).append(entry.getDescription().getValue()) .append(NEWLINE).append("{quote}"); } } @@ -214,7 +214,7 @@ if (paramObj.isFull() && entry.getDescription() != null) { buf.append(NEWLINE).append("<div class='rssitemdescription'>") - .append(NEWLINE).append(entry.getDescription()) + + .append(NEWLINE).append(entry.getDescription().getValue()) .append(NEWLINE).append("</div>"); // close rss.item.description } buf.append(NEWLINE).append("</div>"); // close rss.item
___________________________________________________________________________ Yahoo! Mail r�invente le mail ! D�couvrez le nouveau Yahoo! Mail et son interface r�volutionnaire. http://fr.mail.yahoo.com
Hi, This was a mistake. It's commited in the trunk now Ludovic Vincent Massol a écrit :
Hi Ludovic,
I see you've just committed code in the 1.0 BETA 1 branch... I don't think this is right :-) Actually this branch needs to be closed. We already have a tag for 1.0 BETA 1. Could you please recommit this to trunk?
We've agreed to work on trunk till B2 is released and swithc to a 1.0 branch when we promote it to RC1.
Thanks -Vincent
-----Original Message----- From: Ludovic Dubost [mailto:[email protected]] Sent: vendredi 22 décembre 2006 15:11 To: [email protected] Subject: [xwiki-commits] r1796 - xwiki/branches/XWIKI_1_0_BETA_1/core/src/main/java/com/xpn/xwiki/render /macro/rss
Author: ludovic Date: 2006-12-22 15:10:31 +0100 (Fri, 22 Dec 2006) New Revision: 1796
Modified:
xwiki/branches/XWIKI_1_0_BETA_1/core/src/main/java/com/xpn/xwiki/render /macro/rss/RSSMacro.java Log: XWIKI-283 Fix RssMacro because of changes in Rome
Modified: xwiki/branches/XWIKI_1_0_BETA_1/core/src/main/java/com/xpn/xwiki/render /macro/rss/RSSMacro.java =================================================================== --- xwiki/branches/XWIKI_1_0_BETA_1/core/src/main/java/com/xpn/xwiki/render /macro/rss/RSSMacro.java 2006-12-22 02:34:37 UTC (rev 1795) +++ xwiki/branches/XWIKI_1_0_BETA_1/core/src/main/java/com/xpn/xwiki/render /macro/rss/RSSMacro.java 2006-12-22 14:10:31 UTC (rev 1796) @@ -181,7 +181,7 @@ if (paramObj.isFull() && entry.getDescription() != null) { buf.append(NEWLINE).append("{quote}") - .append(NEWLINE).append(entry.getDescription()) + + .append(NEWLINE).append(entry.getDescription().getValue()) .append(NEWLINE).append("{quote}"); } } @@ -214,7 +214,7 @@ if (paramObj.isFull() && entry.getDescription() != null) { buf.append(NEWLINE).append("<div class='rssitemdescription'>") - .append(NEWLINE).append(entry.getDescription()) + + .append(NEWLINE).append(entry.getDescription().getValue()) .append(NEWLINE).append("</div>"); // close rss.item.description } buf.append(NEWLINE).append("</div>"); // close rss.item
___________________________________________________________________________ Yahoo! Mail r�invente le mail ! D�couvrez le nouveau Yahoo! Mail et son interface r�volutionnaire. http://fr.mail.yahoo.com
-- Ludovic Dubost Blog: http://www.ludovic.org/blog/ XWiki: http://www.xwiki.com Skype: ldubost GTalk: ldubost AIM: nvludo Yahoo: ludovic
participants (2)
-
Ludovic Dubost -
Vincent Massol