diff options
| author | friendica <info@friendica.com> | 2015-03-22 12:56:08 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-03-22 12:56:08 -0700 |
| commit | b198cf69cdffd801651db12c05e5b4661ebe393f (patch) | |
| tree | f64e25904a3a03f8b2662d363774d528e01b78ae /mod | |
| parent | 6631540d20068d3c4ee221518e8f430507662e27 (diff) | |
| parent | e72c3e3e058e6c275b7a50979ab12cfd79b8e7d3 (diff) | |
| download | volse-hubzilla-b198cf69cdffd801651db12c05e5b4661ebe393f.tar.gz volse-hubzilla-b198cf69cdffd801651db12c05e5b4661ebe393f.tar.bz2 volse-hubzilla-b198cf69cdffd801651db12c05e5b4661ebe393f.zip | |
Merge https://github.com/friendica/red into pending_merge
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/sharedwithme.php | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/mod/sharedwithme.php b/mod/sharedwithme.php index d91987027..b77c9dad1 100644 --- a/mod/sharedwithme.php +++ b/mod/sharedwithme.php @@ -12,33 +12,9 @@ function sharedwithme_content(&$a) { $is_owner = (local_channel() && (local_channel() == $channel['channel_id'])); - //maintenance - see if a file got dropped and remove it systemwide - this should possibly go to include/poller - $x = q("SELECT * FROM item WHERE verb = '%s' AND obj_type = '%s' AND uid = %d", - dbesc(ACTIVITY_UPDATE), - dbesc(ACTIVITY_OBJ_FILE), - intval(local_channel()) - ); - - if($x) { - - foreach($x as $xx) { - - $object = json_decode($xx['object'],true); - - $d_mid = $object['d_mid']; - $u_mid = $xx['mid']; - - $y = q("DELETE FROM item WHERE obj_type = '%s' AND (verb = '%s' AND mid = '%s') OR (verb = '%s' AND mid = '%s')", - dbesc(ACTIVITY_OBJ_FILE), - dbesc(ACTIVITY_POST), - dbesc($d_mid), - dbesc(ACTIVITY_UPDATE), - dbesc($u_mid) - ); - - } - - } + //check for updated items and remove them + require_once('include/sharedwithme.php'); + apply_updates(); //drop single file - localuser if((argc() > 2) && (argv(2) === 'drop')) { |