Remove deprecated code

[friendica.git] / src / Database / PostUpdate.php

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 863e823a1389d723e1234011dd68d0c0850f6fa6..7fd28419ea60106eeef11689bb7cb57968a55ed5 100644 (file)
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -4,17 +4,20 @@
  */
 namespace Friendica\Database;
 
-use Friendica\Core\Config;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
+use Friendica\DI;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
 use Friendica\Model\ItemURI;
-use Friendica\Model\UserItem;
 use Friendica\Model\PermissionSet;
+use Friendica\Model\UserItem;
 
 /**
- * Post update functions
+ * These database-intensive post update routines are meant to be executed in the background by the cronjob.
+ *
+ * If there is a need for a intensive migration after a database structure change, update this file
+ * by adding a new method at the end with the number of the new DB_UPDATE_VERSION.
  */
 class PostUpdate
 {
@@ -204,14 +207,20 @@ class PostUpdate
                        }
 
                        if (empty($item['psid'])) {
-                               $item['psid'] = PermissionSet::fetchIDForPost($item);
-                       } else {
-                               $item['allow_cid'] = null;
-                               $item['allow_gid'] = null;
-                               $item['deny_cid'] = null;
-                               $item['deny_gid'] = null;
+                               $item['psid'] = PermissionSet::getIdFromACL(
+                                       $item['uid'],
+                                       $item['allow_cid'],
+                                       $item['allow_gid'],
+                                       $item['deny_cid'],
+                                       $item['deny_gid']
+                               );
                        }
 
+                       $item['allow_cid'] = null;
+                       $item['allow_gid'] = null;
+                       $item['deny_cid'] = null;
+                       $item['deny_gid'] = null;
+
                        if ($item['post-type'] == 0) {
                                if (!empty($item['type']) && ($item['type'] == 'note')) {
                                        $item['post-type'] = Item::PT_PERSONAL_NOTE;