Skip to content

Commit

Permalink
#364 - Sync with changes in 0.19.7
Browse files Browse the repository at this point in the history
  • Loading branch information
johanjanssens committed Mar 7, 2021
1 parent af03e00 commit 3089e98
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions contrib/extensions/k2/model/entity/abstract.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public function getPropertyMetadata()
}

//Remove empty values
$metadata = new KObjectConfigJson($metadata);
$metadata = new ComPagesObjectConfig($metadata);
$metadata->append($this->getConfig()->data->metadata);

if(!isset($metadata->description) && $this->summary) {
Expand Down Expand Up @@ -132,7 +132,7 @@ public function setPropertyDate($value)

public function setPropertyParameters($value)
{
return new KObjectConfigJson($value);
return new ComPagesObjectConfig($value);
}

public function getBasePath()
Expand Down
6 changes: 3 additions & 3 deletions contrib/extensions/k2/model/entity/article.php
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public function getPropertyImage()
];
}

return new KObjectConfigJson($image);
return new ComPagesObjectConfig($image);
}

public function getPropertyMetadata()
Expand Down Expand Up @@ -150,7 +150,7 @@ public function setPropertyTags($value)
}
else $value = [];

return new KObjectConfigJson($value);
return new ComPagesObjectConfig($value);
}

public function setPropertyCategory($value)
Expand Down Expand Up @@ -250,7 +250,7 @@ public function setPropertyParameters($value)

//$params = JComponentHelper::getParams('com_k2')->toArray();

$config = new KObjectConfigJson(/*$params*/);
$config = new ComPagesObjectConfig(/*$params*/);
$config->merge($value); // Override global params with specific params

return $config;
Expand Down
4 changes: 2 additions & 2 deletions contrib/extensions/k2/model/entity/category.php
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public function setPropertyImage($value)
}
}

return new KObjectConfigJson($image);
return new ComPagesObjectConfig($image);
}

public function setPropertyParameters($value)
Expand All @@ -98,7 +98,7 @@ public function setPropertyParameters($value)

//$params = JComponentHelper::getParams('com_k2')->toArray();

$config = new KObjectConfigJson(/*$params*/);
$config = new ComPagesObjectConfig(/*$params*/);
$config->merge($value); // Override global params with article specific params

return $config;
Expand Down

0 comments on commit 3089e98

Please # to comment.