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

Fixed merge errors in CMSProfileController

Browse Source
This commit is contained in:
Ingo Schommer 2012-10-30 18:03:49 +01:00
parent efabde1416
commit 08832261c1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
admin/code/CMSProfileController.php
View File

@ -19,6 +19,7 @@ class CMSProfileController extends LeftAndMain {
$this->setCurrentPageID(Member::currentUserID()); $this->setCurrentPageID(Member::currentUserID());
$form = parent::getEditForm($id, $fields); $form = parent::getEditForm($id, $fields);
if($form instanceof SS_HTTPResponse) return $form;
$form->Fields()->push(new HiddenField('ID', null, Member::currentUserID())); $form->Fields()->push(new HiddenField('ID', null, Member::currentUserID()));
$form->Actions()->push( $form->Actions()->push(
@ -61,7 +62,7 @@ class CMSProfileController extends LeftAndMain {
if(!$member->canEdit()) { if(!$member->canEdit()) {
$form->sessionMessage(_t('Member.CANTEDIT', 'You don\'t have permission to do that'), 'bad'); $form->sessionMessage(_t('Member.CANTEDIT', 'You don\'t have permission to do that'), 'bad');
return $this->controller->redirectBack(); return $this->redirectBack();
} }
$response = parent::save($data, $form); $response = parent::save($data, $form);