mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
BUGFIX Object subclasses with a constructor that didn't already will now call parent to respect inheritance
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@83587 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
parent
e3efb0f554
commit
d838529953
@ -114,6 +114,8 @@ class RSSFeed extends ViewableData {
|
|||||||
|
|
||||||
$this->lastModified = $lastModified;
|
$this->lastModified = $lastModified;
|
||||||
$this->etag = $etag;
|
$this->etag = $etag;
|
||||||
|
|
||||||
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -245,6 +247,8 @@ class RSSFeed_Entry extends ViewableData {
|
|||||||
$this->titleField = $titleField;
|
$this->titleField = $titleField;
|
||||||
$this->descriptionField = $descriptionField;
|
$this->descriptionField = $descriptionField;
|
||||||
$this->authorField = $authorField;
|
$this->authorField = $authorField;
|
||||||
|
|
||||||
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -23,6 +23,7 @@ class RestfulService extends ViewableData {
|
|||||||
function __construct($base, $expiry=3600){
|
function __construct($base, $expiry=3600){
|
||||||
$this->baseURL = $base;
|
$this->baseURL = $base;
|
||||||
$this->cache_expire = $expiry;
|
$this->cache_expire = $expiry;
|
||||||
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -14,6 +14,7 @@ class TokenisedRegularExpression extends Object {
|
|||||||
|
|
||||||
function __construct($expression) {
|
function __construct($expression) {
|
||||||
$this->expression = $expression;
|
$this->expression = $expression;
|
||||||
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
function findAll($tokens) {
|
function findAll($tokens) {
|
||||||
|
@ -25,6 +25,7 @@ class ValidationResult extends Object {
|
|||||||
function __construct($valid = true, $message = null) {
|
function __construct($valid = true, $message = null) {
|
||||||
$this->isValid = $valid;
|
$this->isValid = $valid;
|
||||||
if($message) $this->errorList[] = $message;
|
if($message) $this->errorList[] = $message;
|
||||||
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -45,6 +45,7 @@ class DataDifferencer extends ViewableData {
|
|||||||
if(!$toRecord) user_error("DataDifferencer constructed without a toRecord", E_USER_WARNING);
|
if(!$toRecord) user_error("DataDifferencer constructed without a toRecord", E_USER_WARNING);
|
||||||
$this->fromRecord = $fromRecord;
|
$this->fromRecord = $fromRecord;
|
||||||
$this->toRecord = $toRecord;
|
$this->toRecord = $toRecord;
|
||||||
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -88,6 +88,7 @@ class YamlFixture extends Object {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$this->fixtureFile = $fixtureFile;
|
$this->fixtureFile = $fixtureFile;
|
||||||
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -45,9 +45,9 @@ class CSSContentParser extends Object {
|
|||||||
$tidy = $content;
|
$tidy = $content;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
$this->simpleXML = new SimpleXMLElement($tidy);
|
$this->simpleXML = new SimpleXMLElement($tidy);
|
||||||
|
|
||||||
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -76,6 +76,7 @@ class CSVParser extends Object implements Iterator {
|
|||||||
$this->filename = $filename;
|
$this->filename = $filename;
|
||||||
$this->delimiter = $delimiter;
|
$this->delimiter = $delimiter;
|
||||||
$this->enclosure = $enclosure;
|
$this->enclosure = $enclosure;
|
||||||
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -115,6 +115,7 @@ class ModelViewer_Model extends ViewableData {
|
|||||||
|
|
||||||
function __construct($className) {
|
function __construct($className) {
|
||||||
$this->className = $className;
|
$this->className = $className;
|
||||||
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
function getModule() {
|
function getModule() {
|
||||||
|
@ -149,6 +149,7 @@ class Email extends ViewableData {
|
|||||||
$this->cc = $cc;
|
$this->cc = $cc;
|
||||||
$this->bcc = $bcc;
|
$this->bcc = $bcc;
|
||||||
$this->setBounceHandlerURL($bounceHandlerURL);
|
$this->setBounceHandlerURL($bounceHandlerURL);
|
||||||
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
public function attachFileFromString($data, $filename, $mimetype = null) {
|
public function attachFileFromString($data, $filename, $mimetype = null) {
|
||||||
|
@ -53,6 +53,7 @@ class FormScaffolder extends Object {
|
|||||||
*/
|
*/
|
||||||
function __construct($obj) {
|
function __construct($obj) {
|
||||||
$this->obj = $obj;
|
$this->obj = $obj;
|
||||||
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -332,6 +332,7 @@ class ReportField_SimpleFilter extends Object {
|
|||||||
|
|
||||||
function __construct( $hiddenColumns ) {
|
function __construct( $hiddenColumns ) {
|
||||||
$this->hiddenFields = $hiddenColumns;
|
$this->hiddenFields = $hiddenColumns;
|
||||||
|
parent::__construct();
|
||||||
}
|
}
|
||||||
|
|
||||||
function columnIsVisible( $table, $column ) {
|
function columnIsVisible( $table, $column ) {
|
||||||
|
Loading…
Reference in New Issue
Block a user