From faf272e9060949adacb8f5d02d6e1093c3f3c7ac Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Fri, 17 Sep 2010 14:45:46 +0000
Subject: - Patch #914312 by sdboyer: classes marked 'final' are not picked up
 by the registry.

---
 includes/registry.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'includes/registry.inc')

diff --git a/includes/registry.inc b/includes/registry.inc
index 9a12e393f..99fbfef63 100644
--- a/includes/registry.inc
+++ b/includes/registry.inc
@@ -165,7 +165,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)?\s*(class|interface)\s+([a-zA-Z0-9_]+)/m', $contents, $matches)) {
+  if (preg_match_all('/^\s*(?:abstract|final)?\s*(class|interface)\s+([a-zA-Z0-9_]+)/m', $contents, $matches)) {
     $query = db_insert('registry')->fields(array('name', 'type', 'filename', 'module', 'weight'));
     foreach ($matches[2] as $key => $name) {
       $query->values(array(
-- 
cgit v1.2.3