events: use best_link_url() and zrl() for the author_link (author link as magic-link)

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index a67971cf57b90d833f263b0ece1ae24df3040f19..4af4c6ab37c17b2968d3aae04d859797d9d03570 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -572,7 +572,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
        $expire_interval = Config::get('system', 'dbclean-expire-days', 0);
 
        $r = dba::select('user', array('expire'), array('uid' => $uid), array("limit" => 1));
-       if (dbm::is_result($r) && ($r['expire'] > 0) && ($r['expire'] < $expire_interval)) {
+       if (dbm::is_result($r) && ($r['expire'] > 0) && (($r['expire'] < $expire_interval) || ($expire_interval == 0))) {
                $expire_interval = $r['expire'];
        }
 
@@ -853,7 +853,7 @@ function item_store($arr, $force_parent = false, $notify = false, $dontcache = f
                         * The original author commented, but as this is a comment, the permissions
                         * weren't fixed up so it will still show the comment as private unless we fix it here.
                         */
-                       if ((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private'])) {
+                       if ((intval($r[0]['forum_mode']) == 1) && $r[0]['private']) {
                                $arr['private'] = 0;
                        }