Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

2013-08-07 15:06:50 +02:00
parent e43f0619ca d916e65a14
commit 5df213f5ae
2 changed files with 11 additions and 1 deletions
@@ -463,6 +463,16 @@ class AdminEmployeesControllerCore extends AdminController
 		return parent::initContent();
 	}

+	protected function afterUpdate($object)
+	{
+		$res = parent::afterUpdate($object);
+		// Update cookie if needed
+		if (Tools::getValue('id_employee') == $this->context->employee->id && Tools::getValue('passwd') && $object->passwd != $this->context->employee->passwd)
+			$this->context->cookie->passwd = $this->context->employee->passwd = $object->passwd;
+
+		return $res;
+	}
+
 	public function ajaxProcessGetTabByIdProfile()
 	{
 		$id_profile = Tools::getValue('id_profile');