tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-06-18 10:41:39 +02:00
Code Issues Projects Releases Wiki Activity

Revert "FIX Correct SilverStripeNavigator correctly in templates"

Browse Source 
This reverts commit cf5a0984ad.
This commit is contained in:
Daniel Hensby 2018-05-01 13:00:11 +01:00
parent 80a8e9033e
commit ed17eb2bd8
No known key found for this signature in database
GPG Key ID: D8DEBC4C8E7BC8B9
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
code/Controllers/ContentController.php
View File

@ -355,7 +355,7 @@ class ContentController extends Controller
}
$viewPageIn = _t('SilverStripe\\CMS\\Controllers\\ContentController.VIEWPAGEIN', 'View Page in:');
$navigator = <<<HTML
return <<<HTML
<div id="SilverStripeNavigator">
<div class="holder">
<div id="logInStatus">
@ -370,7 +370,6 @@ 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 +378,9 @@ HTML;
/** @var DBDatetime $dateObj */
$dateObj = DBField::create_field('Datetime', $date);
// $dateObj->setVal($date);
return DBField::create_field('HTMLFragment', "<div id=\"SilverStripeNavigatorMessage\">" .
return "<div id=\"SilverStripeNavigatorMessage\">" .
_t('SilverStripe\\CMS\\Controllers\\ContentController.ARCHIVEDSITEFROM', 'Archived site from') .
"<br>" . $dateObj->Nice() . "</div>");
"<br>" . $dateObj->Nice() . "</div>";
}
}
return null;