Merge remote-tracking branch 'origin/3.0' into 3.1

This commit is contained in:
Ingo Schommer 2013-01-21 10:03:30 +01:00
commit 61f2ab7519

View File

@ -1890,7 +1890,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
if($this->ObsoleteClassName) {
$obsoleteWarning = _t(
'SiteTree.OBSOLETECLASS',
"This page is of obsolete type {type}. Saving will reset it's type and you may lose data",
"This page is of obsolete type {type}. Saving will reset its type and you may lose data",
array('type' => $this->ObsoleteClassName)
);