From ed17eb2bd805a991fdd0f09d3f82af30bc59d375 Mon Sep 17 00:00:00 2001 From: Daniel Hensby Date: Tue, 1 May 2018 13:00:11 +0100 Subject: [PATCH] Revert "FIX Correct SilverStripeNavigator correctly in templates" This reverts commit cf5a0984addf308d2cb10df9b67386be2a080f18. --- code/Controllers/ContentController.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/code/Controllers/ContentController.php b/code/Controllers/ContentController.php index fe24d315..43a6ed63 100644 --- a/code/Controllers/ContentController.php +++ b/code/Controllers/ContentController.php @@ -355,7 +355,7 @@ class ContentController extends Controller } $viewPageIn = _t('SilverStripe\\CMS\\Controllers\\ContentController.VIEWPAGEIN', 'View Page in:'); - $navigator = <<
@@ -370,7 +370,6 @@ class ContentController extends Controller
$message HTML; - return DBField::create_field('HTMLFragment', $navigator); // On live sites we should still see the archived message } else { @@ -379,9 +378,9 @@ HTML; /** @var DBDatetime $dateObj */ $dateObj = DBField::create_field('Datetime', $date); // $dateObj->setVal($date); - return DBField::create_field('HTMLFragment', "
" . + return "
" . _t('SilverStripe\\CMS\\Controllers\\ContentController.ARCHIVEDSITEFROM', 'Archived site from') . - "
" . $dateObj->Nice() . "
"); + "
" . $dateObj->Nice() . "
"; } } return null;