evolution-cms /
evolution
| @@ 795-807 (lines=13) @@ | ||
| 792 | * @param string $old |
|
| 793 | * @return string |
|
| 794 | */ |
|
| 795 | function propUpdate($new,$old){ |
|
| 796 | $newArr = parseProperties($new); |
|
| 797 | $oldArr = parseProperties($old); |
|
| 798 | foreach ($oldArr as $k => $v){ |
|
| 799 | if (isset($v['0']['options'])){ |
|
| 800 | $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options']; |
|
| 801 | } |
|
| 802 | } |
|
| 803 | $return = $oldArr + $newArr; |
|
| 804 | $return = json_encode($return, JSON_UNESCAPED_UNICODE); |
|
| 805 | $return = ($return !== '[]') ? $return : ''; |
|
| 806 | return $return; |
|
| 807 | } |
|
| 808 | ||
| 809 | /** |
|
| 810 | * @param string $propertyString |
|
| @@ 1571-1583 (lines=13) @@ | ||
| 1568 | * @param string $old |
|
| 1569 | * @return string |
|
| 1570 | */ |
|
| 1571 | function propUpdate($new,$old){ |
|
| 1572 | $newArr = parseProperties($new); |
|
| 1573 | $oldArr = parseProperties($old); |
|
| 1574 | foreach ($oldArr as $k => $v){ |
|
| 1575 | if (isset($v['0']['options'])){ |
|
| 1576 | $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options']; |
|
| 1577 | } |
|
| 1578 | } |
|
| 1579 | $return = $oldArr + $newArr; |
|
| 1580 | $return = json_encode($return, JSON_UNESCAPED_UNICODE); |
|
| 1581 | $return = ($return !== '[]') ? $return : ''; |
|
| 1582 | return $return; |
|
| 1583 | } |
|
| 1584 | ||
| 1585 | /** |
|
| 1586 | * @param string $propertyString |
|
