Merged from trunk

git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.3@76205 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Sean Harvey 2009-05-06 03:48:48 +00:00 committed by Sam Minnee
parent 8b23541512
commit 99d132ff9b

View File

@ -38,18 +38,15 @@ class Widget extends DataObject {
}
function Title() {
$instance = singleton($this->class);
return $instance->uninherited('title', true);
return Object::get_static($this->class, 'title');
}
function CMSTitle() {
$instance = singleton($this->class);
return $instance->uninherited('cmsTitle', true);
return Object::get_static($this->class, 'cmsTitle');
}
function Description() {
$instance = singleton($this->class);
return $instance->uninherited('description', true);
return Object::get_static($this->class, 'description');
}
function DescriptionSegment() {