diff MoinMoin/action/AttachFile.py @ 4168:2edbd96f3179

Replaced request.getScriptname() with a werkzeug property
author Florian Krupicka <florian.krupicka@googlemail.com>
date Mon, 16 Jun 2008 12:11:24 +0200
parents 43aa566b0ec7
children 85884c67228d
line wrap: on
line diff
--- a/MoinMoin/action/AttachFile.py	Sun Jun 15 22:38:29 2008 +0200
+++ b/MoinMoin/action/AttachFile.py	Mon Jun 16 12:11:24 2008 +0200
@@ -83,7 +83,7 @@
         qs = '?%s' % wikiutil.makeQueryString(kw, want_unicode=False)
     else:
         qs = ''
-    return "%s/%s%s" % (request.getScriptname(), wikiutil.quoteWikinameURL(pagename), qs)
+    return "%s/%s%s" % (request.script_root, wikiutil.quoteWikinameURL(pagename), qs)
 
 
 def getAttachUrl(pagename, filename, request, addts=0, escaped=0, do='get', drawing='', upload=False):
@@ -489,7 +489,7 @@
 </p>
 </form>
 """ % {
-    'baseurl': request.getScriptname(),
+    'baseurl': request.script_root,
     'pagename': wikiutil.quoteWikinameURL(pagename),
     'action_name': action_name,
     'upload_label_file': _('File to upload'),
@@ -755,7 +755,7 @@
 
     # move file
     d = {'action': action_name,
-         'baseurl': request.getScriptname(),
+         'baseurl': request.script_root,
          'do': 'attachment_move',
          'ticket': wikiutil.createTicket(request),
          'pagename': pagename,