tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

MINOR Merge errors

Browse Source
This commit is contained in:
Ingo Schommer 2012-02-28 00:34:15 +01:00
parent bcc73de85e
commit 832d410303
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/code/LeftAndMain.php
View File

@ -474,6 +474,7 @@ class LeftAndMain extends Controller {
* Return a list of appropriate templates for this class, with the given suffix
*/
public function getTemplatesWithSuffix($suffix) {
$templates = array();
$classes = array_reverse(ClassInfo::ancestry($this->class));
foreach($classes as $class) {
$template = $class . $suffix;

2
admin/templates/Includes/LeftAndMain_EditForm.ss
View File

@ -23,7 +23,7 @@
<!-- <div class="cms-content-search">...</div> -->
<% if Backlink %>
<a class="backlink ss-ui-button" href="$Backlink">
<a class="backlink ss-ui-button cms-panel-link" data-icon="back" href="$Backlink">
<% _t('Back', 'Back') %>
</a>
<% end_if %>