From cbf191b14c080f9bbb904f4741223bb54484fbe8 Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 19 May 2011 10:25:15 +1200 Subject: [PATCH] MINOR Temporarily disabled deprecation notice in DataObjectDecorator and LeftAndMainDecorator, to be re-enabled once we're in beta stage (they unnecessarily break too many modules for now --- admin/code/LeftAndMainDecorator.php | 9 +++++---- model/DataObjectDecorator.php | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/admin/code/LeftAndMainDecorator.php b/admin/code/LeftAndMainDecorator.php index 5e4263cb7..eb3480ce5 100644 --- a/admin/code/LeftAndMainDecorator.php +++ b/admin/code/LeftAndMainDecorator.php @@ -7,10 +7,11 @@ abstract class LeftAndMainDecorator extends LeftAndMainExtension { public function __construct() { - user_error( - 'LeftAndMainDecorator is deprecated, please use LeftAndMainExtension instead.', - E_USER_NOTICE - ); + // TODO Re-enable before we release 3.0 beta, for now it "breaks" too many modules + // user_error( + // 'LeftAndMainDecorator is deprecated, please use LeftAndMainExtension instead.', + // E_USER_NOTICE + // ); parent::__construct(); } diff --git a/model/DataObjectDecorator.php b/model/DataObjectDecorator.php index 01ed429e2..e241ff2d3 100755 --- a/model/DataObjectDecorator.php +++ b/model/DataObjectDecorator.php @@ -7,10 +7,11 @@ abstract class DataObjectDecorator extends DataExtension { public function __construct() { - user_error( - 'DataObjectDecorator is deprecated, please use DataExtension instead.', - E_USER_NOTICE - ); + // TODO Re-enable before we release 3.0 beta, for now it "breaks" too many modules + // user_error( + // 'DataObjectDecorator is deprecated, please use DataExtension instead.', + // E_USER_NOTICE + // ); parent::__construct(); }