Merge pull request #1 from pyload/stable

sync stable

1 files changed, 5 insertions, 4 deletions

diff --git a/module/plugins/crypter/MultiUpOrg.py b/module/plugins/crypter/MultiUpOrg.py
index 5209ebf09..b676c3029 100644
--- a/module/plugins/crypter/MultiUpOrg.py
+++ b/module/plugins/crypter/MultiUpOrg.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
-from urlparse import urljoin
+import urlparse
 
 from module.plugins.internal.SimpleCrypter import SimpleCrypter, create_getInfo
 
@@ -12,8 +12,9 @@ class MultiUpOrg(SimpleCrypter):
     __version__ = "0.03"
 
     __pattern__ = r'http://(?:www\.)?multiup\.org/(en|fr)/(?P<TYPE>project|download|miror)/\w+(/\w+)?'
-    __config__  = [("use_subfolder", "bool", "Save package to subfolder", True),
-                   ("subfolder_per_package", "bool", "Create a subfolder for each package", True)]
+    __config__  = [("use_premium"       , "bool", "Use premium account if available"   , True),
+                   ("use_subfolder"     , "bool", "Save package to subfolder"          , True),
+                   ("subfolder_per_pack", "bool", "Create a subfolder for each package", True)]
 
     __description__ = """MultiUp.org crypter plugin"""
     __license__     = "GPLv3"
@@ -32,7 +33,7 @@ class MultiUpOrg(SimpleCrypter):
             pattern = r'style="width:97%;text-align:left".*\n.*href="(.*)"'
             if m_type == "download":
                 dl_pattern = r'href="(.*)">.*\n.*<h5>DOWNLOAD</h5>'
-                miror_page = urljoin("http://www.multiup.org", re.search(dl_pattern, self.html).group(1))
+                miror_page = urlparse.urljoin("http://www.multiup.org", re.search(dl_pattern, self.html).group(1))
                 self.html = self.load(miror_page)
 
         return re.findall(pattern, self.html)