Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed merge errors in CMSProfileController

  • Loading branch information...
commit 08832261c1f7df55e784fe040fb096fd08899cdf 1 parent efabde1
Ingo Schommer chillu authored
Showing with 2 additions and 1 deletion.
  1. +2 −1  admin/code/CMSProfileController.php
3  admin/code/CMSProfileController.php
View
@@ -19,6 +19,7 @@ public function getEditForm($id = null, $fields = null) {
$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 @@ public function save($data, $form) {
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);
Please sign in to comment.
Something went wrong with that request. Please try again.