5 files changed, 6 insertions, 6 deletions
diff --git a/pyload/plugins/internal/Addon.py b/pyload/plugins/internal/Addon.py
index 1aa51c69a..e0be3097e 100644
--- a/pyload/plugins/internal/Addon.py
+++ b/pyload/plugins/internal/Addon.py
@@ -30,7 +30,7 @@ class Addon(Base):
 
     __config__ = []  #: [("name", "type", "desc", "default")]
 
-    __description__ = """Interface for addon"""
+    __description__ = """Base addon/hook plugin"""
     __license__     = "GPLv3"
     __authors__     = [("mkaay", "mkaay@mkaay.de"),
                        ("RaNaN", "RaNaN@pyload.org")]
@@ -113,7 +113,7 @@ class Addon(Base):
 
     def isActivated(self):
         """ checks if addon is activated"""
-        return self.config.getPlugin(self.__name__, "activated")
+        return self.core.config.getPlugin(self.__name__, "activated")
 
 
     #event methods - overwrite these if needed
diff --git a/pyload/plugins/internal/Container.py b/pyload/plugins/internal/Container.py
index 4bd6644f9..b7dd3aa20 100644
--- a/pyload/plugins/internal/Container.py
+++ b/pyload/plugins/internal/Container.py
@@ -43,7 +43,7 @@ class Container(Crypter):
         if self.pyfile.url.startswith("http"):
             self.pyfile.name = re.findall("([^\/=]+)", self.pyfile.url)[-1]
             content = self.load(self.pyfile.url)
-            self.pyfile.url = safe_join(self.config['general']['download_folder'], self.pyfile.name)
+            self.pyfile.url = safe_join(self.core.config['general']['download_folder'], self.pyfile.name)
             try:
                 with open(self.pyfile.url, "wb") as f:
                     f.write(content)
diff --git a/pyload/plugins/internal/Crypter.py b/pyload/plugins/internal/Crypter.py
index ed92357a5..4fae07ff1 100644
--- a/pyload/plugins/internal/Crypter.py
+++ b/pyload/plugins/internal/Crypter.py
@@ -63,7 +63,7 @@ class Crypter(Plugin):
         package_password = self.pyfile.package().password
         package_queue = self.pyfile.package().queue
 
-        folder_per_package = self.config['general']['folder_per_package']
+        folder_per_package = self.core.config['general']['folder_per_package']
         try:
             use_subfolder = self.getConfig('use_subfolder')
         except:
diff --git a/pyload/plugins/internal/MultiHoster.py b/pyload/plugins/internal/MultiHoster.py
index 88a9c888b..02594e04e 100644
--- a/pyload/plugins/internal/MultiHoster.py
+++ b/pyload/plugins/internal/MultiHoster.py
@@ -11,7 +11,7 @@ class MultiHoster(Addon):
     __type__    = "addon"
     __version__ = "0.20"
 
-    __description__ = """Generic MultiHoster plugin"""
+    __description__ = """Base multi-hoster plugin"""
     __license__     = "GPLv3"
     __authors__     = [("pyLoad Team", "admin@pyload.org")]
 
diff --git a/pyload/plugins/internal/OCR.py b/pyload/plugins/internal/OCR.py
index b5ee30cb7..dec9f28b7 100644
--- a/pyload/plugins/internal/OCR.py
+++ b/pyload/plugins/internal/OCR.py
@@ -18,7 +18,7 @@ class OCR(object):
     __type__    = "ocr"
     __version__ = "0.01"
 
-    __description__ = """OCR base plugin"""
+    __description__ = """Base OCR plugin"""
     __license__     = "GPLv3"
     __authors__     = [("pyLoad Team", "admin@pyload.org")]