Merge branch 'stable' into 0.4.10

Conflicts:
	module/plugins/Account.py
	module/plugins/AccountManager.py
	module/plugins/Hook.py
	module/plugins/OCR.py
	module/plugins/Plugin.py
	module/plugins/PluginManager.py
	module/plugins/ReCaptcha.py
	module/plugins/accounts/Ftp.py
	module/plugins/accounts/Http.py
	module/plugins/internal/MultiHoster.py
	module/plugins/ocr/GigasizeCom.py
	module/plugins/ocr/LinksaveIn.py
	module/plugins/ocr/NetloadIn.py
	module/plugins/ocr/ShareonlineBiz.py

1 files changed, 6 insertions, 2 deletions

diff --git a/module/plugins/crypter/DDLMusicOrg.py b/module/plugins/crypter/DDLMusicOrg.py
index 27cff3f9d..f5e7203d3 100644
--- a/module/plugins/crypter/DDLMusicOrg.py
+++ b/module/plugins/crypter/DDLMusicOrg.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 
 import re
+
 from time import sleep
 
 from module.plugins.Crypter import Crypter
@@ -9,12 +10,15 @@ from module.plugins.Crypter import Crypter
 class DDLMusicOrg(Crypter):
     __name__ = "DDLMusicOrg"
     __type__ = "crypter"
-    __pattern__ = r'http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+'
     __version__ = "0.3"
+
+    __pattern__ = r'http://(?:www\.)?ddl-music\.org/captcha/ddlm_cr\d\.php\?\d+\?\d+'
+
     __description__ = """Ddl-music.org decrypter plugin"""
     __author_name__ = "mkaay"
     __author_mail__ = "mkaay@mkaay.de"
 
+
     def setup(self):
         self.multiDL = False
 
@@ -39,6 +43,6 @@ class DDLMusicOrg(Crypter):
                                            "linknr": linknr})
         m = re.search(r"<form id=\"ff\" action=\"(.*?)\" method=\"post\">", htmlwithlink)
         if m:
-            self.packages.append((pyfile.package().name, [m.group(1)], pyfile.package().folder))
+            self.urls = [m.group(1)]
         else:
             self.retry()