From 2000087dd651ea0dec4b4450a9d315dc6b5a4084 Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Tue, 7 Jul 2009 01:28:47 +0000 Subject: [PATCH] BUGFIX: Fixed application of parameterised extensions with Object::add_extension() git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@81173 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/Object.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/Object.php b/core/Object.php index 853d1bfc4..864366eab 100755 --- a/core/Object.php +++ b/core/Object.php @@ -368,7 +368,7 @@ abstract class Object { * as a string, e.g. "Versioned" or "Translatable('Param')" */ public static function add_extension($class, $extension) { - if(!preg_match('/([^(]*)/', $extension, $matches)) { + if(!preg_match('/^([^(]*)/', $extension, $matches)) { return false; } $extensionClass = $matches[1]; @@ -393,7 +393,7 @@ abstract class Object { // load statics now for DataObject classes if(is_subclass_of($class, 'DataObject')) { - DataObjectDecorator::load_extra_statics($class, $extension); + DataObjectDecorator::load_extra_statics($class, $extensionClass); } }