Database version increased, code simplified

diff --git a/database.sql b/database.sql
index 308e2e8a862228c385aff983938ffe51c22a6b30..a36adad01588cfe0f7dec8eb30f43d7ec3208e68 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2022.05-dev (Siberian Iris)
--- DB_UPDATE_VERSION 1451
+-- DB_UPDATE_VERSION 1452
 -- ------------------------------------------
 
 

diff --git a/src/Model/Item.php b/src/Model/Item.php
index 9c67426344bb8ac3b958c86eafb2bbcbd042e501..96cf5c488c35b1f9b599958bdd399876d0a20fd7 100644 (file)
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -2516,11 +2516,6 @@ class Item
                        return true;
                }
 
-               $allow_cid = $allow_cid ?? $item['allow_cid'];
-               $allow_gid = $allow_gid ?? $item['allow_gid'];
-               $deny_cid  = $deny_cid ?? $item['deny_cid'];
-               $deny_gid  = $deny_gid ?? $item['deny_gid'];
-
                $objtype = $item['resource-id'] ? Activity\ObjectType::IMAGE : Activity\ObjectType::NOTE;
 
                $new_item = [
@@ -2541,10 +2536,10 @@ class Item
                        'body'          => $activity,
                        'verb'          => $activity,
                        'object-type'   => $objtype,
-                       'allow_cid'     => $allow_cid,
-                       'allow_gid'     => $allow_gid,
-                       'deny_cid'      => $deny_cid,
-                       'deny_gid'      => $deny_gid,
+                       'allow_cid'     => $allow_cid ?? $item['allow_cid'],
+                       'allow_gid'     => $allow_gid ?? $item['allow_gid'],
+                       'deny_cid'      => $deny_cid ?? $item['deny_cid'],
+                       'deny_gid'      => $deny_gid ?? $item['deny_gid'],
                        'visible'       => 1,
                        'unseen'        => 1,
                ];

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 01419bf2b7247966597660a8472483a6e5a39eac..f7e02b10b942ee4c74bbd89bbfcc90350522ac10 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -55,7 +55,7 @@
 use Friendica\Database\DBA;
 
 if (!defined('DB_UPDATE_VERSION')) {
-       define('DB_UPDATE_VERSION', 1451);
+       define('DB_UPDATE_VERSION', 1452);
 }
 
 return [