Merge pull request #3030 from Hypolite/bug/proxy_url_extension

[friendica.git] / include / expire.php

diff --git a/include/expire.php b/include/expire.php
index 30868042167ab6416c079d92d56edf6f88438f0f..eca2b1c42ad9a7ee3962c047e8c67e7faeb22051 100644 (file)
--- a/include/expire.php
+++ b/include/expire.php
@@ -18,7 +18,6 @@ function expire_run(&$argv, &$argc){
 
        require_once('include/session.php');
        require_once('include/datetime.php');
-       require_once('library/simplepie/simplepie.inc');
        require_once('include/items.php');
        require_once('include/Contact.php');
 
@@ -40,7 +39,7 @@ function expire_run(&$argv, &$argc){
        logger('expire: start');
 
        $r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0");
-       if(count($r)) {
+       if (dbm::is_result($r)) {
                foreach($r as $rr) {
                        logger('Expire: ' . $rr['username'] . ' interval: ' . $rr['expire'], LOGGER_DEBUG);
                        item_expire($rr['uid'],$rr['expire']);