Mercurial > moin > 1.9
comparison MoinMoin/wikiutil.py @ 455:e5609b8b7647
fix MoinMoinBugs/SelfInterWikiNotWorkAsExpect
imported from: moin--main--1.5--patch-459
author | Thomas Waldmann <tw@waldmann-edv.de> |
---|---|
date | Sat, 25 Feb 2006 12:29:22 +0000 |
parents | c85132ab35e3 |
children | 9b6ba709da88 |
comparison
equal
deleted
inserted
replaced
454:e099072bba24 | 455:e5609b8b7647 |
---|---|
411 wikitag, tail = wikiurl.split(":", 1) | 411 wikitag, tail = wikiurl.split(":", 1) |
412 except ValueError: | 412 except ValueError: |
413 try: | 413 try: |
414 wikitag, tail = wikiurl.split("/", 1) | 414 wikitag, tail = wikiurl.split("/", 1) |
415 except ValueError: | 415 except ValueError: |
416 wikitag = None | 416 wikitag, tail = 'Self', wikiurl |
417 tail = None | 417 return wikitag, tail |
418 | |
419 return (wikitag, tail) | |
420 | 418 |
421 | 419 |
422 def join_wiki(wikiurl, wikitail): | 420 def join_wiki(wikiurl, wikitail): |
423 """ | 421 """ |
424 Add a page name to an interwiki url. | 422 Add a page name to an interwiki url. |
486 | 484 |
487 # split wiki url | 485 # split wiki url |
488 wikitag, tail = split_wiki(wikiurl) | 486 wikitag, tail = split_wiki(wikiurl) |
489 | 487 |
490 # return resolved url | 488 # return resolved url |
491 if wikitag and _interwiki_list.has_key(wikitag): | 489 if _interwiki_list.has_key(wikitag): |
492 return (wikitag, _interwiki_list[wikitag], tail, False) | 490 return (wikitag, _interwiki_list[wikitag], tail, False) |
493 else: | 491 else: |
494 return (wikitag, request.getScriptname(), "/InterWiki", True) | 492 return (wikitag, request.getScriptname(), "/InterWiki", True) |
495 | 493 |
496 | 494 |