tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-09-27 20:06:43 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #211 from halkyon/broken_urls_cms

Browse Source 
BUG Fixing broken links "admin/show", should be "admin/pages..."
This commit is contained in:
Simon Welsh 2012-09-24 20:35:26 -07:00
commit ef318e3899
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
code/model/SiteTree.php
View File

@ -1771,9 +1771,9 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
$parentPage = $linkedPage->Parent;
if($parentPage) {
if($parentPage->ID) {
$parentPageLinks[] = "<a class=\"cmsEditlink\" href=\"admin/show/$linkedPage->ID\">{$parentPage->Title}</a>";
$parentPageLinks[] = "<a class=\"cmsEditlink\" href=\"admin/pages/edit/show/$linkedPage->ID\">{$parentPage->Title}</a>";
} else {
$parentPageLinks[] = "<a class=\"cmsEditlink\" href=\"admin/show/$linkedPage->ID\">" .
$parentPageLinks[] = "<a class=\"cmsEditlink\" href=\"admin/pages/edit/show/$linkedPage->ID\">" .
_t('SiteTree.TOPLEVEL', 'Site Content (Top Level)') .
"</a>";
}
@ -1821,7 +1821,7 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
);
$dependentTable->getConfig()->getComponentByType('GridFieldDataColumns')
->setFieldFormatting(array(
'Title' => '<a href=\"admin/show/$ID\">$Title</a>',
'Title' => '<a href=\"admin/pages/edit/show/$ID\">$Title</a>',
'AbsoluteLink' => '<a href=\"$value\">$value</a>',
));
}
@ -2747,4 +2747,4 @@ class SiteTree extends DataObject implements PermissionProvider,i18nEntityProvid
self::$cache_permissions = array();
}
}
}

2
tasks/RemoveOrphanedPagesTask.php
View File

@ -102,7 +102,7 @@ in the other stage:<br />
)
);
$label = sprintf(
'<a href="admin/show/%d">%s</a> <small>(#%d, Last Modified Date: %s, Last Modifier: %s, %s)</small>',
'<a href="admin/pages/edit/show/%d">%s</a> <small>(#%d, Last Modified Date: %s, Last Modifier: %s, %s)</small>',
$orphan->ID,
$orphan->Title,
$orphan->ID,