pkp#6186 If the field is multilingual, but doesn't have a default val…

…ue, it still need to be decoded (cherry picked from commit 224509c) (cherry picked from commit 81def38)
bozana · Apr 26, 2024 · b687fc3 · b687fc3
1 parent 6517cad
commit b687fc3
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/classes/plugins/ThemePlugin.php b/classes/plugins/ThemePlugin.php
@@ -579,7 +579,7 @@ public function getOptionValues($contextId)
                         break;
                     case 'array':
                         try {
-                            $value = json_decode($value, true, flags: JSON_THROW_ON_ERROR);
+                            $value = json_decode((string) $value, true, flags: JSON_THROW_ON_ERROR);
                         } catch (Exception) {
                             // FIXME: pkp/pkp-lib#6250 Remove after 3.3.x upgrade code is removed (see also pkp/pkp-lib#5772)
                             $value = unserialize($value);
@@ -588,6 +588,16 @@ public function getOptionValues($contextId)
                         break;
                 }
             }
+            // If the value isn't null and it's a multilingual field, then we must ensure it's an array
+            if ($optionConfig->isMultilingual && $value !== null && !is_array($value)) {
+                try {
+                    $value =  json_decode((string) $value, true, flags: JSON_THROW_ON_ERROR);
+                } catch (Exception) {
+                    // FIXME: pkp/pkp-lib#6250 Remove after 3.3.x upgrade code is removed (see also pkp/pkp-lib#5772)
+                    $value = unserialize($value);
+                }
+                $value = is_array($value) ? $value : [];
+            }
             $return[$optionName] = $value;
         }