tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-10-22 08:05:56 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	code/Controllers/ContentController.php
This commit is contained in:
Damian Mooyman 2018-04-05 08:37:48 +12:00
commit c6af8856c8
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:'); $viewPageIn = _t(__CLASS__ . '.VIEWPAGEIN', 'View Page in:');
return <<<HTML $navigator = <<<HTML
<div id="SilverStripeNavigator"> <div id="SilverStripeNavigator">
<div class="holder"> <div class="holder">
<div id="logInStatus"> <div id="logInStatus">
@ -371,6 +371,7 @@ class ContentController extends Controller
</div> </div>
$message $message
HTML; HTML;
return DBField::create_field('HTMLFragment', $navigator);
// On live sites we should still see the archived message // On live sites we should still see the archived message
} else { } else {
@ -379,9 +380,9 @@ HTML;
/** @var DBDatetime $dateObj */ /** @var DBDatetime $dateObj */
$dateObj = DBField::create_field('Datetime', $date); $dateObj = DBField::create_field('Datetime', $date);
// $dateObj->setVal($date); // $dateObj->setVal($date);
return "<div id=\"SilverStripeNavigatorMessage\">" . return DBField::create_field('HTMLFragment', "<div id=\"SilverStripeNavigatorMessage\">" .
_t(__CLASS__ . '.ARCHIVEDSITEFROM', 'Archived site from') . _t(__CLASS__ . '.ARCHIVEDSITEFROM', 'Archived site from') .
"<br>" . $dateObj->Nice() . "</div>"; "<br>" . $dateObj->Nice() . "</div>");
} }
} }
return null; return null;