summaryrefslogtreecommitdiff
path: root/includes/registry.inc
diff options
context:
space:
mode:
authorDavid Rothstein <drothstein@gmail.com>2015-10-12 23:32:29 -0400
committerDavid Rothstein <drothstein@gmail.com>2015-10-12 23:32:29 -0400
commit183a425c551969d4f56b04766fca82819a2a7b15 (patch)
tree08a4a9651b71c031133e2c7b508bc908793d62c9 /includes/registry.inc
parentf12effc70c835e77bfdea394214df9247533d319 (diff)
downloadbrdo-183a425c551969d4f56b04766fca82819a2a7b15.tar.gz
brdo-183a425c551969d4f56b04766fca82819a2a7b15.tar.bz2
Issue #2508055 by Dave Reid, David_Rothstein, hussainweb: Add support for autoloading Traits
Diffstat (limited to 'includes/registry.inc')
-rw-r--r--includes/registry.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/registry.inc b/includes/registry.inc
index 5fc767487..29a1fca8c 100644
--- a/includes/registry.inc
+++ b/includes/registry.inc
@@ -164,7 +164,7 @@ function _registry_parse_files($files) {
* (optional) Weight of the module.
*/
function _registry_parse_file($filename, $contents, $module = '', $weight = 0) {
- if (preg_match_all('/^\s*(?:abstract|final)?\s*(class|interface)\s+([a-zA-Z0-9_]+)/m', $contents, $matches)) {
+ if (preg_match_all('/^\s*(?:abstract|final)?\s*(class|interface|trait)\s+([a-zA-Z0-9_]+)/m', $contents, $matches)) {
foreach ($matches[2] as $key => $name) {
db_merge('registry')
->key(array(