Wiki: Correctly fix getting subreddit name from revision model

mikehas · Sep 12, 2012 · a527104 · a527104
1 parent d10ca35
commit a527104
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/r2/r2/models/wiki.py b/r2/r2/models/wiki.py
@@ -150,10 +150,7 @@ def page(self):
 
     @property
     def sr(self):
-        id36 = self.info['sr']
-        if c.site._id36 == id36:
-            return c.site.name
-        return Subreddit._byID36(id36).name
+        return self.info['sr']
 
 
 class WikiPage(tdb_cassandra.Thing):

diff --git a/r2/r2/templates/wikirevision.html b/r2/r2/templates/wikirevision.html
@@ -42,12 +42,12 @@
 
     %if not c.page:
         <td>
-            <a href="/r/${thing.sr}/wiki/${thing.page}">${thing.page}</a>
+            <a href="${c.wiki_base_url}/${thing.page}">${thing.page}</a>
         </td>
     %endif
 
     <td>
-        <a href="/r/${thing.sr}/wiki/${thing.page}?v=${thing._id}">view</a>
+        <a href="${c.wiki_base_url}/${thing.page}?v=${thing._id}">view</a>
     </td>
 
     <td>
@@ -63,7 +63,7 @@
             <a href="#" class="revision_hide" data-revision="${thing._id}" data-page="${thing.page}">hide</a>
         </td>
         <td class="wiki_revert" style="white-space: nowrap;">
-            ${ynbutton(_("revert here"), _("done"), "../r/%s/wiki/api/revert/%s/%s" % (thing.sr, thing._id, thing.page), post_callback="$.refresh")}
+            ${ynbutton(_("revert here"), _("done"), "..%s/api/revert/%s/%s" % (c.wiki_base_url, thing._id, thing.page), post_callback="$.refresh")}
         </td>
     %endif