diff --git a/pumpio/pumpio_sync.php b/pumpio/pumpio_sync.php index af843c1d..e691a387 100644 --- a/pumpio/pumpio_sync.php +++ b/pumpio/pumpio_sync.php @@ -1,4 +1,7 @@ */ +use Friendica\App; + require_once 'include/Emailer.php'; /* because the fraking openpgp-php is in composer, require libs in composer diff --git a/twitter/twitter.php b/twitter/twitter.php index 74245fa2..74121d29 100644 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -688,15 +688,7 @@ function twitter_expire($a,$b) { if ($days == 0) return; - if (method_exists('dba', 'delete')) { - $r = dba::select('item', array('id'), array('deleted' => true, 'network' => NETWORK_TWITTER)); - while ($row = dba::fetch($r)) { - dba::delete('item', array('id' => $row['id'])); - } - dba::close($r); - } else { - $r = q("DELETE FROM `item` WHERE `deleted` AND `network` = '%s'", dbesc(NETWORK_TWITTER)); - } + $r = q("DELETE FROM `item` WHERE `deleted` AND `network` = '%s'", dbesc(NETWORK_TWITTER)); require_once("include/items.php"); diff --git a/twitter/twitter_sync.php b/twitter/twitter_sync.php index 6c76af7c..49c41354 100644 --- a/twitter/twitter_sync.php +++ b/twitter/twitter_sync.php @@ -1,4 +1,7 @@