mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-09-30 05:09:06 +02:00
Fixed merge errors in CMSProfileController
This commit is contained in:
parent
efabde1416
commit
08832261c1
@ -19,6 +19,7 @@ class CMSProfileController extends LeftAndMain {
|
||||
$this->setCurrentPageID(Member::currentUserID());
|
||||
|
||||
$form = parent::getEditForm($id, $fields);
|
||||
if($form instanceof SS_HTTPResponse) return $form;
|
||||
|
||||
$form->Fields()->push(new HiddenField('ID', null, Member::currentUserID()));
|
||||
$form->Actions()->push(
|
||||
@ -61,7 +62,7 @@ class CMSProfileController extends LeftAndMain {
|
||||
|
||||
if(!$member->canEdit()) {
|
||||
$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);
|
||||
|
Loading…
Reference in New Issue
Block a user