fix params in update

Dmi3yy · Jul 8, 2017 · ee04ac8 · ee04ac8
1 parent 4418f8c
commit ee04ac8
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/assets/modules/store/installer/instprocessor-fast.php b/assets/modules/store/installer/instprocessor-fast.php
@@ -531,7 +531,12 @@ function parseProperties($propertyString) {
 function propUpdate($new,$old){
     $newArr = parseProperties($new);
     $oldArr = parseProperties($old);
-    $return = array_merge_recursive($oldArr, $newArr);
+    foreach ($oldArr as $k => $v){
+        if (isset($v['0']['options'])){
+            $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options'];
+        }
+    }
+    $return = $oldArr + $newArr;
     $return = json_encode($return, JSON_UNESCAPED_UNICODE);
     return $return;
 }
@@ -561,6 +566,7 @@ function parseProperties($propertyString, $elementName = null, $elementType = nu
                     case 'list-multi':
                     case 'checkbox':
                     case 'radio':
+                    case 'menu':
                         $property[$key['0']]['0']['value'] = trim($arr['3']);
                         $property[$key['0']]['0']['options'] = trim($arr['2']);
                         $property[$key['0']]['0']['default'] = trim($arr['3']);

diff --git a/assets/modules/store/installer/instprocessor.php b/assets/modules/store/installer/instprocessor.php
@@ -483,7 +483,12 @@ function parseProperties($propertyString) {
 function propUpdate($new,$old){
     $newArr = parseProperties($new);
     $oldArr = parseProperties($old);
-    $return = array_merge_recursive($oldArr, $newArr);
+    foreach ($oldArr as $k => $v){
+        if (isset($v['0']['options'])){
+            $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options'];
+        }
+    }
+    $return = $oldArr + $newArr;
     $return = json_encode($return, JSON_UNESCAPED_UNICODE);
     return $return;
 }
@@ -513,6 +518,7 @@ function parseProperties($propertyString, $elementName = null, $elementType = nu
                     case 'list-multi':
                     case 'checkbox':
                     case 'radio':
+                    case 'menu':
                         $property[$key['0']]['0']['value'] = trim($arr['3']);
                         $property[$key['0']]['0']['options'] = trim($arr['2']);
                         $property[$key['0']]['0']['default'] = trim($arr['3']);

diff --git a/install/instprocessor.php b/install/instprocessor.php
@@ -779,7 +779,12 @@ function parseProperties($propertyString) {
 function propUpdate($new,$old){
     $newArr = parseProperties($new);
     $oldArr = parseProperties($old);
-    $return = array_merge_recursive($oldArr, $newArr);
+    foreach ($oldArr as $k => $v){
+        if (isset($v['0']['options'])){
+            $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options'];
+        }
+    }
+    $return = $oldArr + $newArr;
     $return = json_encode($return, JSON_UNESCAPED_UNICODE);
     return $return;
 }
@@ -809,6 +814,7 @@ function parseProperties($propertyString, $elementName = null, $elementType = nu
                     case 'list-multi':
                     case 'checkbox':
                     case 'radio':
+                    case 'menu':
                         $property[$key['0']]['0']['value'] = trim($arr['3']);
                         $property[$key['0']]['0']['options'] = trim($arr['2']);
                         $property[$key['0']]['0']['default'] = trim($arr['3']);