LudvigStrigeus: IgnoreMissingWikiPatch_r1506.diff

Changeset.py

@@ -68 +68 @@
             'time': time.asctime(time.localtime(chgset.date)),
             'author': util.escape(chgset.author or 'anonymous'),
             'message': wiki_to_html(util.wiki_escape_newline(chgset.message or '--'),
-                                    req.hdf, self.env, self.db)
+                                    req.hdf, self.env, self.db, ignore_missing_pages=1)
         }
 
         oldest_rev = repos.oldest_rev

WikiFormatter.py

@@ -136 +136 @@
     env = None
     absurls = 0
 
-    def __init__(self, env, db, absurls=0):
+    def __init__(self, env, db, absurls=0, ignore_missing_pages=0):
         self.env = env
-        self.db = db
+        self.db = db
+        self.ignore_missing_pages = ignore_missing_pages
         self._href = absurls and env.abs_href or env.href
         self._local = env.config.get('project', 'url', '') or env.abs_href.base
 
@@ -252 +253 @@
             page = page[:page.find('#')]
         page = urllib.unquote(page)
         text = urllib.unquote(text)
-        if not self.env._wiki_pages.has_key(page):
-            return '<a class="missing wiki" href="%s" rel="nofollow">%s?</a>' \
-                   % (self._href.wiki(page) + anchor, text)
-        else:
+        if self.env._wiki_pages.has_key(page):
             return '<a class="wiki" href="%s">%s</a>' \
                    % (self._href.wiki(page) + anchor, text)
+        elif self.ignore_missing_pages:
+            return text
+        else:
+            return '<a class="missing wiki" href="%s" rel="nofollow">%s?</a>' \
+                   % (self._href.wiki(page) + anchor, text)
 
     def _make_changeset_link(self, rev, text):
         cursor = self.db.cursor()
@@ -390 +393 @@
                                          'meta|param|doctype)')
     _htmlproc_disallow_attribute = re.compile('(?i)<[^>]*\s+(on\w+)=')
 
-    def __init__(self, hdf, env, db, absurls=0):
-        CommonFormatter.__init__(self, env, db, absurls)
+    def __init__(self, hdf, env, db, absurls=0, ignore_missing_pages=0):
+        CommonFormatter.__init__(self, env, db, absurls, ignore_missing_pages)
         self.hdf = hdf
         self.anchors = []
 
@@ -636 +639 @@
         self.close_indentation()
         self.close_list()
 
-
-def wiki_to_html(wikitext, hdf, env, db, absurls=0):
+def wiki_to_html(wikitext, hdf, env, db, absurls=0, ignore_missing_pages=0):
     out = StringIO.StringIO()
-    Formatter(hdf, env, db, absurls).format(wikitext, out)
+    Formatter(hdf, env, db, absurls, ignore_missing_pages).format(wikitext, out)
     return out.getvalue()
 
-
-def wiki_to_oneliner(wikitext, env, db, absurls=0):
+def wiki_to_oneliner(wikitext, env, db, absurls=0, ignore_missing_pages=0):
     out = StringIO.StringIO()
-    OneLinerFormatter(env, db, absurls).format(wikitext, out)
+    OneLinerFormatter(env, db, absurls, ignore_missing_pages).format(wikitext, out)
     return out.getvalue()