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

Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source
This commit is contained in:
redmatrix 2015-05-19 18:26:46 -07:00
commit d63bcde6e2
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
mod/impel.php
View File

@ -91,10 +91,11 @@ function impel_init(&$a) {
dbesc($namespace), dbesc($namespace),
intval(local_channel()) intval(local_channel())
); );
$i = q("select id from item where mid = '%s' and uid = %d limit 1", $i = q("select id, item_restrict from item where mid = '%s' and uid = %d limit 1",
dbesc($arr['mid']), dbesc($arr['mid']),
intval(local_channel()) intval(local_channel())
); );
if($z && $i) { if($z && $i) {
$remote_id = $z[0]['id']; $remote_id = $z[0]['id'];
$arr['id'] = $i[0]['id']; $arr['id'] = $i[0]['id'];
@ -103,6 +104,13 @@ function impel_init(&$a) {
$x = item_store_update($arr,$execflag); $x = item_store_update($arr,$execflag);
} }
else { else {
if(($i) && ($i[0]['item_restrict'] & ITEM_DELETED)) {
// was partially deleted already, finish it off
q("delete from item where mid = '%s' and uid = %d",
dbesc($arr['mid']),
intval(local_channel())
);
}
$x = item_store($arr,$execflag); $x = item_store($arr,$execflag);
} }
if($x['success']) if($x['success'])