Merge remote-tracking branch 'origin/stable'

Conflicts:
	module/plugins/accounts/FilesonicCom.py
	module/plugins/accounts/OronCom.py
	module/plugins/accounts/ShareonlineBiz.py
	module/plugins/addons/UpdateManager.py
	module/plugins/crypter/FilesonicComFolder.py
	module/plugins/hoster/BezvadataCz.py
	module/plugins/hoster/EuroshareEu.py
	module/plugins/hoster/FilesonicCom.py
	module/plugins/hoster/MegauploadCom.py
	module/plugins/hoster/Premium4Me.py
	module/plugins/hoster/YoutubeCom.py
	module/plugins/internal/MultiHoster.py
	module/utils.py

1 files changed, 4 insertions, 1 deletions

diff --git a/module/plugins/hoster/PutlockerCom.py b/module/plugins/hoster/PutlockerCom.py
index 8cfcd4d9e..ca5336231 100644
--- a/module/plugins/hoster/PutlockerCom.py
+++ b/module/plugins/hoster/PutlockerCom.py
@@ -52,7 +52,7 @@ class PutlockerCom(Hoster):
     __name__ = "PutlockerCom"
     __type__ = "hoster"
     __pattern__ = r'http://(www\.)?putlocker\.com/(file|embed)/[A-Z0-9]+'
-    __version__ = "0.2"
+    __version__ = "0.21"
     __description__ = """Putlocker.Com"""
     __author_name__ = ("jeix")
    
@@ -111,6 +111,9 @@ class PutlockerCom(Hoster):
             self.link = re.search("\"(/get_file\\.php\\?download=[A-Z0-9]+\\&key=[a-z0-9]+&original=1)\"", self.html2)
             
         if self.link is None:
+            self.link = re.search("\"(/get_file\\.php\\?id=[A-Z0-9]+\\&key=[A-Za-z0-9=]+\\&original=1)\"", self.html2)
+            
+        if self.link is None:
             self.link = re.search("playlist: \\'(/get_file\\.php\\?stream=[A-Za-z0-9=]+)\\'", self.html2)
             if not self.link is None:
                 self.html3 = self.load("http://www.putlocker.com" + self.link.group(1))