Merges from upstream Kabuki.

This commit is contained in:
2017-11-05 16:27:12 +01:00
parent 31e1357b47
commit 1a15e347f2
6 changed files with 35 additions and 25 deletions

View File

@@ -116,13 +116,6 @@ class Asset
}
}
public static function byPostId($id_post, $return_format = 'object')
{
$db = Registry::get('db');
// !!! TODO
}
public static function createNew(array $data, $return_format = 'object')
{
// Extract the data array.
@@ -438,7 +431,19 @@ class Asset
public function delete()
{
return Registry::get('db')->query('
$db = Registry::get('db');
if (!unlink(ASSETSDIR . '/' . $this->subdir . '/' . $this->filename))
return false;
$db->query('
DELETE FROM assets_meta
WHERE id_asset = {int:id_asset}',
[
'id_asset' => $this->id_asset,
]);
return $db->query('
DELETE FROM assets
WHERE id_asset = {int:id_asset}',
[
@@ -481,7 +486,7 @@ class Asset
public static function getCount()
{
return $db->queryValue('
return Registry::get('db')->queryValue('
SELECT COUNT(*)
FROM assets');
}