Bugfix for pull request #2147 (Fix for issue #2122)

[friendica.git] / include / expire.php

diff --git a/include/expire.php b/include/expire.php
index 5fa0ec758b3d723b45ac53b2a7b0dd0a951962ec..30868042167ab6416c079d92d56edf6f88438f0f 100644 (file)
--- a/include/expire.php
+++ b/include/expire.php
@@ -2,16 +2,16 @@
 
 require_once("boot.php");
 
-function expire_run($argv, $argc){
+function expire_run(&$argv, &$argc){
        global $a, $db;
 
        if(is_null($a)) {
                $a = new App;
        }
-  
+
        if(is_null($db)) {
            @include(".htconfig.php");
-       require_once("dba.php");
+       require_once("include/dba.php");
            $db = new dba($db_host, $db_user, $db_pass, $db_data);
        unset($db_host, $db_user, $db_pass, $db_data);
        };
@@ -25,17 +25,20 @@ function expire_run($argv, $argc){
        load_config('config');
        load_config('system');
 
-
        $a->set_baseurl(get_config('system','url'));
 
 
        // physically remove anything that has been deleted for more than two months
 
        $r = q("delete from item where deleted = 1 and changed < UTC_TIMESTAMP() - INTERVAL 60 DAY");
-       q("optimize table item");
+
+       // make this optional as it could have a performance impact on large sites
+
+       if(intval(get_config('system','optimize_items')))
+               q("optimize table item");
 
        logger('expire: start');
-       
+
        $r = q("SELECT `uid`,`username`,`expire` FROM `user` WHERE `expire` != 0");
        if(count($r)) {
                foreach($r as $rr) {
@@ -44,10 +47,14 @@ function expire_run($argv, $argc){
                }
        }
 
+       load_hooks();
+
+       call_hooks('expire');
+
        return;
 }
 
 if (array_search(__file__,get_included_files())===0){
-  expire_run($argv,$argc);
+  expire_run($_SERVER["argv"],$_SERVER["argc"]);
   killme();
 }