Fix remote torrent add in the webui

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 14cfa2dd0..622dbd203 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 === Deluge 1.1.9 - (In Development) ===
+==== GtkUI ====
   * Fix #950 renaming a parent folder into multiple folders
 
+==== WebUI ====
+  * Fix remote torrent add
+
 === Deluge 1.1.8 - (21 May 2009) ===
 ==== Core ====
   * Fix pause all/resume all
diff --git a/deluge/ui/webui/pages.py b/deluge/ui/webui/pages.py
index 92cea02a9..18e4a7568 100644
--- a/deluge/ui/webui/pages.py
+++ b/deluge/ui/webui/pages.py
@@ -379,12 +379,12 @@ class remote_torrent_add:
             return 'error:wrong password'
 
         if vars.data_b64: #b64 post (greasemonkey)
-            data_b64 = unicode(vars.data_b64)
+            data_b64 = base64.decodestring(unicode(vars.data_b64))
             torrent_name = vars.torrent_name
         else:  #file-post (curl)
             data_b64 = base64.b64encode(vars.torrent.file.read())
             torrent_name = vars.torrent.filename
-        proxy.add_torrent_filecontent(torrent_name, data_b64)
+        proxy.add_torrent_file_binary(torrent_name, data_b64)
         return 'ok'
 route("/remote/torrent/add(.*)", remote_torrent_add)