Merge branch 'master' into reddit.com

reddit-archive · Feb 1, 2009 · 8b2171c · 8b2171c
2 parents 0046e4d + 2d594bf
commit 8b2171c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,6 @@
+== Version 1.3.2.1 ==
+* Workaround for null subreddit bug.
+
 == Version 1.3.2 ==
 * Fix namespace pollution.
 * Fix Ctrl-arrow cursor movement in submit bar textbox.

diff --git a/install.rdf b/install.rdf
@@ -8,7 +8,7 @@
                    em:maxVersion="3.1b2" />
   <RDF:Description RDF:about="urn:mozilla:install-manifest"
                    em:id="socialite@chromakode"
-                   em:version="1.3.2"
+                   em:version="1.3.2.1"
                    em:type="2"
                    em:iconURL="chrome://socialite/content/socialite.png"
                    em:optionsURL="chrome://socialite/content/socialitePreferences.xul"

diff --git a/modules/reddit/reddit.jsm b/modules/reddit/reddit.jsm
@@ -299,7 +299,11 @@ RedditSite.prototype.createBarContentUI = function(document, linkInfo) {
     };
 
     let subredditURL = function() {
-      return site.siteURL+"r/"+barContent.linkInfo.localState.subreddit+"/";
+      if (barContent.linkInfo.localState.subreddit) {
+        return site.siteURL+"r/"+barContent.linkInfo.localState.subreddit+"/";
+      } else {
+        return site.siteURL;
+      }
     };
 
     this.labelScore.addEventListener("click", function(e) {