mirror/php-typemill
1
0
Fork 0
mirror of https://github.com/typemill/typemill.git synced 2025-08-05 05:37:45 +02:00
Code Issues Releases Wiki Activity

v2.1.2 fix owner value false in metadata

Browse Source
This commit is contained in:
trendschau
2024-01-25 21:17:32 +01:00
parent 49301c1722
commit 4ac8874a8a
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
system/typemill/Controllers/ControllerApiAuthorArticle.php
View File

@@ -332,7 +332,7 @@ class ControllerApiAuthorArticle extends Controller
# META is important e.g. for newsletter, so send it, too
$meta = new Meta();
$metadata = $meta->getMetaData($item);
$metadata = $meta->addMetaDefaults($metadata, $item, $this->settings['author']);
$metadata = $meta->addMetaDefaults($metadata, $item, $this->settings['author'], $request->getAttribute('c_username'));
# $metadata = $meta->addMetaTitleDescription($metadata, $item, $markdownArray);
# dispatch event, e.g. send newsletter and more

10
system/typemill/Controllers/ControllerApiAuthorMeta.php
View File

@@ -33,9 +33,15 @@ class ControllerApiAuthorMeta extends Controller
$metadata = $meta->getMetaData($item);
if(!$metadata)
if(!$metadata or !isset($metadata['meta']['owner']) OR !$metadata['meta']['owner'])
{
$metadata = $meta->addMetaDefaults($metadata, $item, $this->settings['author']);
$metadata = $meta->addMetaDefaults($metadata, $item, $this->settings['author'], $request->getAttribute('c_username'));
}
#fix for version 1 because owner in meta is often 'false'
if(!isset($metadata['meta']['owner']) OR !$metadata['meta']['owner'])
{
$metadata = $meta->addMetaDefaults($metadata, $item, $this->settings['author'], $request->getAttribute('c_username'));
}
# if user is not allowed to perform this action (e.g. not admin)

11
system/typemill/Models/Meta.php
View File

@@ -20,7 +20,7 @@ class Meta
public function getMetaData($item)
{
$metadata = $this->storage->getYaml('contentFolder', '', $item->pathWithoutType . '.yaml');
return $metadata;
}
@@ -116,10 +116,13 @@ class Meta
$meta['meta'] = [];
}
if(!isset($meta['meta']['owner']))
if(!isset($meta['meta']['owner']) OR !$meta['meta']['owner'])
{
$meta['meta']['owner'] = $currentuser;
$modified = true;
if($currentuser)
{
$meta['meta']['owner'] = $currentuser;
$modified = true;
}
}
if(!isset($meta['meta']['author']))