tonyair/silverstripe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-cms synced 2024-07-02 01:19:22 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/3.0' into 3.1

Browse Source 
Conflicts:
	code/controllers/SilverStripeNavigator.php
This commit is contained in:
Ingo Schommer 2013-02-07 21:44:41 +01:00
commit 53c2059a01
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/controllers/CMSPageHistoryController.php
View File

@ -122,11 +122,6 @@ class CMSPageHistoryController extends CMSMain {
$fields = $fields->makeReadonly(); $fields = $fields->makeReadonly();
foreach($fields->dataFields() as $field) {
$field->dontEscape = true;
$field->reserveNL = true;
}
if($compareID) { if($compareID) {
$link = Controller::join_links( $link = Controller::join_links(
$this->Link('show'), $this->Link('show'),

4
code/controllers/SilverStripeNavigator.php
View File

@ -238,13 +238,13 @@ class SilverStripeNavigatorItem_CMSLink extends SilverStripeNavigatorItem {
} }
public function isActive() { public function isActive() {
return (Controller::curr() instanceof CMSMain); return (Controller::curr() instanceof LeftAndMain);
} }
public function canView($member = null) { public function canView($member = null) {
return ( return (
// Don't show in CMS // Don't show in CMS
!(Controller::curr() instanceof CMSMain) !(Controller::curr() instanceof LeftAndMain)
// Don't follow redirects in preview, they break the CMS editing form // Don't follow redirects in preview, they break the CMS editing form
&& !($this->record instanceof RedirectorPage) && !($this->record instanceof RedirectorPage)
); );