mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 12:05:37 +00:00
MINOR: Removed unnecessary extension instance check in Object->__construct(), since Extensions no longer inherit from Object.
From: Andrew Short <andrewjshort@gmail.com> git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@88772 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
64612f2070
commit
d4acf7c938
@ -503,9 +503,6 @@ abstract class Object {
|
|||||||
public function __construct() {
|
public function __construct() {
|
||||||
$this->class = get_class($this);
|
$this->class = get_class($this);
|
||||||
|
|
||||||
// Don't do magic methods and/or extensions on extensions themselves.
|
|
||||||
if($this instanceof Extension) return;
|
|
||||||
|
|
||||||
// Don't bother checking some classes that should never be extended
|
// Don't bother checking some classes that should never be extended
|
||||||
static $notExtendable = array('Object', 'ViewableData', 'DataObject', 'RequestHandler');
|
static $notExtendable = array('Object', 'ViewableData', 'DataObject', 'RequestHandler');
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user