Merge pull request #62 from silverstripe-scienceninjas/master

BUGFIX: SiteTree#getCMSFields would only calculate local variable $linkedPages if ID was valid, but would then refer to that variable regardless
This commit is contained in:
Sam Minnée 2012-03-05 13:08:22 -08:00
commit 703ac7b47e

View File

@ -1760,7 +1760,6 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
// Create a status message for multiple parents // Create a status message for multiple parents
if($this->ID && is_numeric($this->ID)) { if($this->ID && is_numeric($this->ID)) {
$linkedPages = $this->VirtualPages(); $linkedPages = $this->VirtualPages();
}
$parentPageLinks = array(); $parentPageLinks = array();
@ -1791,6 +1790,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$parentList $parentList
); );
} }
}
if($this->HasBrokenLink || $this->HasBrokenFile) { if($this->HasBrokenLink || $this->HasBrokenFile) {
$statusMessage[] = _t('SiteTree.HASBROKENLINKS', "This page has broken links."); $statusMessage[] = _t('SiteTree.HASBROKENLINKS', "This page has broken links.");