From 3728ec4bb869e18278561cf704469465551e7b6c Mon Sep 17 00:00:00 2001
From: Frederic Massart <fred@moodle.com>
Date: Fri, 9 May 2014 15:26:53 +0800
Subject: [PATCH] Not every subplugins were found by the plugin manager

---
 lib/plugins.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/plugins.py b/lib/plugins.py
index 51d702d..7081797 100644
--- a/lib/plugins.py
+++ b/lib/plugins.py
@@ -134,6 +134,7 @@ class PluginManager(object):
     @classmethod
     def getSubtypes(cls, M):
         """Get the sub plugins declared in an instance"""
+        regex = re.compile(r'\s*(?P<brackets>[\'"])(.*?)(?P=brackets)\s*=>\s*(?P=brackets)(.*?)(?P=brackets)')
         subtypes = {}
         for t in cls._supportSubtypes:
             path = cls.getTypeDirectory(t, M)
@@ -145,8 +146,6 @@ class PluginManager(object):
                 if not os.path.isfile(subpluginsfile):
                     continue
 
-                regex = re.compile(r'^\s*(?P<brackets>[\'"])(.*)(?P=brackets)\s*=>\s*(?P=brackets)(.*)(?P=brackets)')
-
                 searchOpen = False
                 f = open(subpluginsfile, 'r')
                 for line in f:
@@ -158,6 +157,11 @@ class PluginManager(object):
                         if search:
                             for match in search:
                                 subtypes[match[1]] = match[2].replace('admin/', '{admin}/')
+
+                    # Exit when we find a semi-colon.
+                    if searchOpen and ';' in line:
+                        break
+
         return subtypes
 
     @classmethod
-- 
2.11.0