From 7b17300a3cdcf2691510738c9bada418167c9bb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20M=C3=BCller?= <mueller@miconware.de>
Date: Thu, 1 May 2014 12:42:51 +0200
Subject: [PATCH] css

---
 app/Controller/UserController.php  | 1 +
 app/View/User/settings_account.ctp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Controller/UserController.php b/app/Controller/UserController.php
index 1e8f156..7324ac7 100755
--- a/app/Controller/UserController.php
+++ b/app/Controller/UserController.php
@@ -265,6 +265,7 @@ class UserController extends AppController {
 					
 					$result = false;
 					if($company){
+						$profil['AppUser']['nickname'] = $this->request->data['AppUser']['nickname'];
 						$profil['DreamjobCompany']['corporateform'] = $this->request->data['DreamjobCompany']['corporateform'];
 						$profil['DreamjobCompany']['owner'] = $this->request->data['DreamjobCompany']['owner'];
 						$profil['DreamjobCompany']['branch_id'] = $this->request->data['DreamjobCompany']['branch_id'];
diff --git a/app/View/User/settings_account.ctp b/app/View/User/settings_account.ctp
index 9be0764..e64d822 100644
--- a/app/View/User/settings_account.ctp
+++ b/app/View/User/settings_account.ctp
@@ -85,7 +85,7 @@ if($profil['AppUser']['take_systemwide']){
 		?>
 		<div class="buttonrow">
 			<?=$this->Html->link(__('dreamjob.settings.delete'),array('controller'=>'user', 'action'=>'profil_delete'),array("class" => "btn btn-default"));?>
-			<?=$this->Form->button(__('dreamjob.settings.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
+			<?=$this->Form->button(__('dreamjob.save'),array('div' => false,'class'=>"btn btn-primary ",'type' => 'submit'));?>
 		</div>
 	</fieldset>
 	<?php echo $this->Form->end(); ?>