tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 09:05:53 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX Making sure that LeftAndMain->CurrentPage() respects language settings - was returning pages in different language from session after switching between languages in cms

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@70324 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-01-19 00:26:02 +00:00
parent 84f6f5d396
commit ad5471afdb
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
code/LeftAndMain.php
View File

@ -849,16 +849,17 @@ JS;
} }
public function EditForm() { public function EditForm() {
$id = isset($_REQUEST['ID']) ? $_REQUEST['ID'] : $this->currentPageID(); if(isset($_REQUEST['ID'])) {
$record = DataObject::get_by_id($this->stat('tree_class'), $_REQUEST['ID']);
if(!$id) return false; } else {
$record = $this->CurrentPage();
if(is_numeric($id)) {
$record = DataObject::get_by_id($this->stat('tree_class'), $id);
if($record && !$record->canView()) return Security::permissionFailure($this);
} }
if(!$record) return false;
if($record && !$record->canView()) return Security::permissionFailure($this);
return $this->getEditForm($id); return $this->getEditForm($record->ID);
} }
public function myprofile() { public function myprofile() {
@ -905,7 +906,12 @@ JS;
public function currentPage() { public function currentPage() {
$id = $this->currentPageID(); $id = $this->currentPageID();
if($id && is_numeric($id)) { if($id && is_numeric($id)) {
return DataObject::get_by_id($this->stat('tree_class'), $id); $page = DataObject::get_by_id($this->stat('tree_class'), $id);
if(Translatable::is_enabled() && $page->Lang && $page->Lang != Translatable::current_lang()) {
return false;
} else {
return $page;
}
} }
} }