Merge pull request #8272 from MrPetovan/bug/8254-regex-url-img

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

diff --git a/src/Database/PostUpdate.php b/src/Database/PostUpdate.php
index 44e203ab49a4d045f23a187233cd06f0ca337017..cd7e8b94626376e027168d4c324a76437a7c8202 100644 (file)
--- a/src/Database/PostUpdate.php
+++ b/src/Database/PostUpdate.php
@@ -1,21 +1,40 @@
 <?php
 /**
- * @file src/Database/PostUpdate.php
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  */
+
 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
 {
@@ -205,14 +224,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;