changeset 4390:df4c0a1fa898

merged moin/1.7
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 09 Oct 2008 21:45:14 +0200
parents a5df4e239f2a (current diff) c5268cc28125 (diff)
children 0b9869467641
files MoinMoin/action/fckdialog.py
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/action/fckdialog.py	Sun Oct 05 00:21:38 2008 +0200
+++ b/MoinMoin/action/fckdialog.py	Thu Oct 09 21:45:14 2008 +0200
@@ -246,8 +246,8 @@
     if not scriptname or scriptname[-1] != "/":
         scriptname += "/"
     action = scriptname
-    basepage = request.page.page_name.encode(config.charset)
-    request.write('''
+    basepage = request.page.page_name
+    request.write(u'''
 <!--
  * FCKeditor - The text editor for internet
  * Copyright (C) 2003-2004 Frederico Caldeira Knabben