harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

slight changes to set_iconfig - if passed an item structure only update the structure. Update the DB only if passed an item_id. This makes a clean separation of behaviour that's easy to document. One could get into some weird situations the original way which tried to update and sync both.

Browse Source
This commit is contained in:
redmatrix 2016-02-16 22:53:27 -08:00
parent 77eb6c5761
commit 41ec5403e1
1 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
include/items.php
View File

@ -5480,10 +5480,10 @@ function get_iconfig(&$item, $family, $key) {
dbesc($key) dbesc($key)
); );
if($r) { if($r) {
$v = ((preg_match('|^a:[0-9]+:{.*}$|s',$r[0]['v'])) ? unserialize($r[0]['v']) : $r[0]['v']); $r[0]['v'] = ((preg_match('|^a:[0-9]+:{.*}$|s',$r[0]['v'])) ? unserialize($r[0]['v']) : $r[0]['v']);
if($is_item) if($is_item)
$item['iconfig'][] = $r[0]; $item['iconfig'][] = $r[0];
return $v; return $r[0]['v'];
} }
return false; return false;
@ -5504,31 +5504,25 @@ function set_iconfig(&$item, $family, $key, $value) {
$item['iconfig'] = array(); $item['iconfig'] = array();
elseif($item['iconfig']) { elseif($item['iconfig']) {
for($x = 0; $x < count($item['iconfig']); $x ++) { for($x = 0; $x < count($item['iconfig']); $x ++) {
if($item['iconfig'][$x]['cat'] == $family && $item['iconfig']['k'] == $key) { if($item['iconfig'][$x]['cat'] == $family && $item['iconfig'][$x]['k'] == $key) {
$idx = $x; $idx = $x;
} }
} }
} }
if(array_key_exists('item_id',$item)) $entry = array('cat' => $family, 'k' => $key, 'v' => $value);
$iid = intval($item['item_id']);
else
$iid = intval($item['id']);
if(is_null($idx))
$item['iconfig'][] = $entry;
else
$item['iconfig'][$idx] = $entry;
return $value;
} }
elseif(intval($item))
if(intval($item))
$iid = intval($item); $iid = intval($item);
if(! $iid) { if(! $iid)
$entry = array('cat' => $family, 'k' => $key, 'v' => $value);
if($is_item) {
if(is_null($idx))
$item['iconfig'][] = $entry;
else
$item['iconfig'][$idx] = $entry;
return $value;
}
return false; return false;
}
if(get_iconfig($item, $family, $key) === false) { if(get_iconfig($item, $family, $key) === false) {
$r = q("insert into iconfig( iid, cat, k, v ) values ( %d, '%s', '%s', '%s' ) ", $r = q("insert into iconfig( iid, cat, k, v ) values ( %d, '%s', '%s', '%s' ) ",
@ -5547,23 +5541,9 @@ function set_iconfig(&$item, $family, $key, $value) {
); );
} }
$y = q("select * from iconfig where iid = %d and cat = '%s' and k = '%s' limit 1", if(! $r)
intval($iid),
dbesc($family),
dbesc($key)
);
if(! $y)
return false; return false;
$y[0]['v'] = $value;
if($is_item) {
if(is_null($idx))
$item['iconfig'][] = $y[0];
else
$item['iconfig'][$idx] = $y[0];
}
return $value; return $value;
} }