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

classes/controller/AdminController.php

@@ -803,7 +803,7 @@ class AdminControllerCore extends Controller
 						if (empty($this->redirect_after))
 							$this->redirect_after = self::$currentIndex.($parent_id ? '&'.$this->identifier.'='.$object->id : '').'&conf=4&token='.$this->token;
 					}
-					Logger::addLog(sprintf($this->l('%s edition'), $this->className), 1, null, $this->className, (int)$this->object->id, true, (int)$this->context->employee->id);
+					Logger::addLog(sprintf($this->l('%s edition'), $this->className), 1, null, $this->className, (int)$object->id, true, (int)$this->context->employee->id);
 				}
 				else
 					$this->errors[] = Tools::displayError('An error occurred while updating an object.').
@@ -3013,4 +3013,4 @@ class AdminControllerCore extends Controller
 
 		return $return;
 	}
-}
+}

classes/db/DbPDO.php

@@ -25,8 +25,6 @@
 */
 
 /**
- * This class is currently only here for tests
- *
  * @since 1.5.0
  */
 class DbPDOCore extends Db