|
|
@@ -1774,7 +1774,7 @@ class Database
|
|
|
if ($vi[$v['sync'][0]] > 0) {
|
|
|
$load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $v['sync'][1] => $vi[$v['sync'][0]]));
|
|
|
} else {
|
|
|
- $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $v['sync'][2] => $vi[$v['sync'][2]], 'option_' . $v['sync'][3] => $vi[$v['sync'][0]]));
|
|
|
+ $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $v['sync'][3] => $vi[$v['sync'][2]], 'option_' . $v['sync'][4] => $vi[$v['sync'][0]]));
|
|
|
}
|
|
|
|
|
|
$data[$ki][$k] = $vi[$k] = isset($load[$temp[2]]) ? $load[$temp[2]] : $v['default'];
|
|
|
@@ -2283,9 +2283,7 @@ class Database
|
|
|
$load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $vi['sync'][1] => $v[$vi['sync'][0]]));
|
|
|
} else {
|
|
|
$lw = array('option_' . $vi['sync'][3] => $v[$vi['sync'][2]], 'option_' . $vi['sync'][4] => $v[$vi['sync'][0]]);
|
|
|
- print_r($lw);
|
|
|
$load = Dever::load($temp[0] . '/' . $temp[1] . '-one', $lw);
|
|
|
- print_r($load);die;
|
|
|
}
|
|
|
|
|
|
$data[$k][$ki] = $v[$ki] = isset($load[$temp[2]]) ? $load[$temp[2]] : $vi['default'];
|
|
|
@@ -3008,7 +3006,7 @@ class Database
|
|
|
if ($data[$param['sync'][0]] > 0) {
|
|
|
$load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $param['sync'][1] => $data[$param['sync'][0]]));
|
|
|
} else {
|
|
|
- $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $param['sync'][2] => $data[$param['sync'][2]], 'option_' . $param['sync'][3] => $data[$param['sync'][0]]));
|
|
|
+ $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $param['sync'][3] => $data[$param['sync'][2]], 'option_' . $param['sync'][4] => $data[$param['sync'][0]]));
|
|
|
}
|
|
|
|
|
|
$param['value'] = isset($load[$temp[2]]) ? $load[$temp[2]] : $param['default'];
|
dever