[Pkg-mozext-commits] [sage-extension] 08/08: no channel link fix

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag sage_1_3_1
in repository sage-extension.

commit cc3bed024f9edfde288c2e8405eba9c47f183c55
Author: Peter Andrews <petea at jhu.edu>
Date:   Fri Dec 10 07:02:25 2004 +0000

    no channel link fix
---
 src/install.rdf                | 2 +-
 src/sage/content/commonfunc.js | 2 +-
 src/sage/content/feedlib.js    | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/install.rdf b/src/install.rdf
index a824e60..df381e5 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -6,7 +6,7 @@
 
 	<em:id>{a6ca9b3b-5e52-4f47-85d8-cca35bb57596}</em:id>
 	<em:name>Sage</em:name>
-	<em:version>1.3</em:version>
+	<em:version>1.3.1</em:version>
 	<em:description>A lightweight RSS and Atom feed aggregator.</em:description>
 	<em:creator>The Sage Project</em:creator>
 	<em:contributor>Peter Andrews</em:contributor>
diff --git a/src/sage/content/commonfunc.js b/src/sage/content/commonfunc.js
index 757437b..60e3084 100755
--- a/src/sage/content/commonfunc.js
+++ b/src/sage/content/commonfunc.js
@@ -69,7 +69,7 @@ function dateFormat(date, twelveHourClock, format) {
 
 var CommonFunc = {
 
-	VERSION: Array(1,3,0),
+	VERSION: Array(1,3,1),
 	USER_AGENT: "Mozilla/5.0 (Sage)",
 
 	FEED_FOLDER_ID: "sage.folder_id",
diff --git a/src/sage/content/feedlib.js b/src/sage/content/feedlib.js
index 98c6962..6ef3d28 100644
--- a/src/sage/content/feedlib.js
+++ b/src/sage/content/feedlib.js
@@ -93,7 +93,7 @@ Feed.prototype.parseRSS = function() {
 					break;
 				case "link":
 					if(!item.link) {
-						item.link = URIFixup.createFixupURI(this.link, nsIURIFixup.FIXUP_FLAG_NONE).resolve(CommonFunc.getInnerText(j));
+						item.link = this.link ? URIFixup.createFixupURI(this.link, nsIURIFixup.FIXUP_FLAG_NONE).resolve(CommonFunc.getInnerText(j)) : CommonFunc.getInnerText(j);
 					}
 					break;
 				case "guid":
@@ -131,7 +131,7 @@ Feed.prototype.parseRSS = function() {
 		}
 
 		if(!item.link && guid) {
-			item.link = URIFixup.createFixupURI(this.link, nsIURIFixup.FIXUP_FLAG_NONE).resolve(guid);
+			item.link = this.link ? URIFixup.createFixupURI(this.link, nsIURIFixup.FIXUP_FLAG_NONE).resolve(guid) : guid;
 		}
 
 		var tmpFeedItem = new FeedItem(item.title, item.link, item.content, item.pubDate);
@@ -195,7 +195,7 @@ Feed.prototype.parseAtom = function() {
 		if(linkNodes.length) {
 			for (var j = 0; j < linkNodes.length; j++) {
 				if (linkNodes[j].getAttribute("rel").toLowerCase() == "alternate") {
-					item.link = URIFixup.createFixupURI(this.link, nsIURIFixup.FIXUP_FLAG_NONE).resolve(linkNodes[j].getAttribute("href"));
+					item.link = this.link ? URIFixup.createFixupURI(this.link, nsIURIFixup.FIXUP_FLAG_NONE).resolve(linkNodes[j].getAttribute("href")) : linkNodes[j].getAttribute("href");
 					break;
 				}
 			}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/sage-extension.git