changeset 237:ccfa707e7064

added builtin support for linking irc:// URLs imported from: moin--main--1.5--patch-240
author Thomas Waldmann <tw@waldmann-edv.de>
date Thu, 24 Nov 2005 19:21:37 +0000
parents 81620fd76cac
children b80624429934
files MoinMoin/parser/wiki.py MoinMoin/theme/__init__.py docs/CHANGES
diffstat 3 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/parser/wiki.py	Thu Nov 24 19:08:11 2005 +0000
+++ b/MoinMoin/parser/wiki.py	Thu Nov 24 19:21:37 2005 +0000
@@ -32,7 +32,7 @@
     PARENT_PREFIX = wikiutil.PARENT_PREFIX
     attachment_schemas = ["attachment", "inline", "drawing"]
     punct_pattern = re.escape(u'''"\'}]|:,.)?!''')
-    url_pattern = (u'http|https|ftp|nntp|news|mailto|telnet|wiki|file|' +
+    url_pattern = (u'http|https|ftp|nntp|news|mailto|telnet|wiki|file|irc|' +
             u'|'.join(attachment_schemas) + 
             (config.url_schemas and u'|' + u'|'.join(config.url_schemas) or ''))
 
--- a/MoinMoin/theme/__init__.py	Thu Nov 24 19:08:11 2005 +0000
+++ b/MoinMoin/theme/__init__.py	Thu Nov 24 19:21:37 2005 +0000
@@ -230,8 +230,8 @@
         html = u'<ul id="username">\n%s</ul>' % ''.join(userlinks)
         return html
 
-    # Schemas supported in toolbar links, using [url label] foramrt
-    linkSchemas = [r'http://', r'https://', r'ftp://', 'mailto:'] + \
+    # Schemas supported in toolbar links, using [url label] format
+    linkSchemas = [r'http://', r'https://', r'ftp://', 'mailto:', r'irc://', ] + \
                   [x + ':' for x in config.url_schemas]
 
     def splitNavilink(self, text, localize=1):
--- a/docs/CHANGES	Thu Nov 24 19:08:11 2005 +0000
+++ b/docs/CHANGES	Thu Nov 24 19:21:37 2005 +0000
@@ -8,6 +8,9 @@
       when you really tried when you had no delete rights additionally.
     * We don't remove RenamePage and DeletePage from menu any more if user is
       unknown. This stuff is only driven by ACLs now.
+  Other changes:
+    * Added irc:// to the builtin supported link schemas. You can remove it
+      from config.url_schemas in case you have patched it in there.
 
 Version 1.5.0beta4:
   Fixes: