tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.1' into 4

This commit is contained in:
Damian Mooyman 2018-04-05 08:38:24 +12:00
parent 24ab6a90e1 c6af8856c8
commit 48f53a522a
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/Controllers/ContentController.php
View File

@ -356,7 +356,7 @@ class ContentController extends Controller
}
$viewPageIn = _t(__CLASS__ . '.VIEWPAGEIN', 'View Page in:');
return <<<HTML
$navigator = <<<HTML
<div id="SilverStripeNavigator">
<div class="holder">
<div id="logInStatus">
@ -371,6 +371,7 @@ class ContentController extends Controller
</div>
$message
HTML;
return DBField::create_field('HTMLFragment', $navigator);
// On live sites we should still see the archived message
} else {
@ -379,9 +380,9 @@ HTML;
/** @var DBDatetime $dateObj */
$dateObj = DBField::create_field('Datetime', $date);
// $dateObj->setVal($date);
return "<div id=\"SilverStripeNavigatorMessage\">" .
return DBField::create_field('HTMLFragment', "<div id=\"SilverStripeNavigatorMessage\">" .
_t(__CLASS__ . '.ARCHIVEDSITEFROM', 'Archived site from') .
"<br>" . $dateObj->Nice() . "</div>";
"<br>" . $dateObj->Nice() . "</div>");
}
}
return null;