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

classes/Employee.php

@@ -248,7 +248,7 @@ class EmployeeCore extends ObjectModel
 		{
 			/* Employee is valid only if it can be load and if cookie password is the same as database one */
 			Cache::store('isLoggedBack'.$this->id, (
-				$this->id && Validate::isUnsignedId($this->id) && Employee::checkPassword($this->id, $this->passwd)
+				$this->id && Validate::isUnsignedId($this->id) && Employee::checkPassword($this->id, Context::getContext()->cookie->passwd)
 				&& (!isset($this->remote_addr) || $this->remote_addr == ip2long(Tools::getRemoteAddr()) || !Configuration::get('PS_COOKIE_CHECKIP'))
 			));
 		}

controllers/admin/AdminEmployeesController.php

@@ -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');