The item table is now completely removed

[friendica.git] / src / Model / Post.php

diff --git a/src/Model/Post.php b/src/Model/Post.php
index 30515d7116a293bb80f04e1fe4a14f2ef4ce5f8b..e3114ca90995e05b44d5698ecb7743c56b54aac2 100644 (file)
--- a/src/Model/Post.php
+++ b/src/Model/Post.php
@@ -23,7 +23,6 @@ namespace Friendica\Model;
 
 use BadMethodCallException;
 use Friendica\Core\Logger;
-use Friendica\Core\System;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
 use Friendica\Database\DBStructure;
@@ -94,6 +93,10 @@ class Post
                        }
                }
 
+               if (array_key_exists('extid', $row) && is_null($row['extid'])) {
+                       $row['extid'] = '';
+               }
+
                return $row;
        }
 
@@ -221,7 +224,7 @@ class Post
                        $selected = array_merge(Item::DISPLAY_FIELDLIST, Item::ITEM_FIELDLIST);
 
                        if ($view == 'post-thread-view') {
-                               $selected = array_merge($selected, ['ignored', 'iid']);
+                               $selected = array_merge($selected, ['ignored']);
                        }
                }
 
@@ -242,13 +245,7 @@ class Post
         */
        public static function select(array $selected = [], array $condition = [], $params = [])
        {
-               $timestamp = microtime(true);
-               $data = self::selectView('post-view', $selected, $condition, $params);
-               
-               $duration = microtime(true) - $timestamp;;
-               if ($duration > 0.1)
-                       Logger::info('Blubb', ['duration' => $duration, 'selected' => $selected, 'condition' => $condition, 'params' => $params, 'callstack' => System::callstack(20)]);
-               return $data;
+               return self::selectView('post-view', $selected, $condition, $params);
        }
 
        /**
@@ -331,7 +328,6 @@ class Post
         */
        public static function selectForUser($uid, array $selected = [], array $condition = [], $params = [])
        {
-               //Logger::info('Blubb', ['uid' => $uid, 'selected' => $selected, 'condition' => $condition, 'params' => $params]);
                return self::selectViewForUser('post-view', $uid, $selected, $condition, $params);
        }
 
@@ -519,23 +515,6 @@ class Post
                        $affected = max($affected, DBA::affectedRows());
                }
 
-               $update_fields = [];
-               foreach (Item::USED_FIELDLIST as $field) {
-                       if (array_key_exists($field, $fields)) {
-                               $update_fields[$field] = $fields[$field];
-                       }
-               }
-               if (!empty($update_fields)) {
-                       $rows = DBA::selectToArray('post-view', ['id'], $condition, []);
-                       $ids = array_column($rows, 'id');
-                       if (!DBA::update('item', $update_fields, ['id' => $ids])) {
-                               DBA::rollback();
-                               Logger::notice('Updating item failed', ['fields' => $update_fields, 'condition' => $condition]);
-                               return false;
-                       }
-                       $affected = max($affected, DBA::affectedRows());
-               }
-
                DBA::commit();
 
                Logger::info('Updated posts', ['rows' => $affected]);