admin/core
1
0
Fork 0
mirror of https://github.com/jbcr/core.git synced 2026-04-02 14:22:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Jarek Jakubowski
2019-01-21 22:55:32 +01:00
parent 88f7e91bf4
commit bc8ddfacc0
1 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Controller/Backend/ContentEditController.php
View File

@@ -120,15 +120,10 @@ class ContentEditController extends BaseController
$this->updateFieldFromPost($fieldName, $fieldValue, $content, $locale);
}
<<<<<<< Updated upstream
if (isset($post['taxonomy'])) {
foreach ($post['taxonomy'] as $key => $taxonomy) {
$this->updateTaxonomyFromPost($key, $taxonomy, $content);
if (isset($formData['taxonomy'])) {
foreach ($formData['taxonomy'] as $fieldName => $taxonomy) {
$this->updateTaxonomyFromPost($fieldName, $taxonomy, $content);
}
=======
foreach ($formData['taxonomy'] as $fieldName => $taxonomy) {
$this->updateTaxonomyFromPost($fieldName, $taxonomy, $content);
>>>>>>> Stashed changes
}
return $content;