Merge branch 'fix-fatal' into item-view

diff --git a/static/dbview.config.php b/static/dbview.config.php
index 4d7eadc..6c75ac0 100755 (executable)
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -37,6 +37,96 @@
  */
 
 return [
+       "item-view" => [
+               "fields" => [
+/*
+"uid" => ["item", ""], 
+"parent" => ["item", ""], 
+"uri" => ["item", ""], 
+"parent-uri" => ["item", ""], 
+"thr-parent" => ["item", ""],
+"guid" => ["item", ""], 
+"uri-id" => ["item", ""], 
+"parent-uri-id" => ["item", ""], 
+"thr-parent-id" => ["item", ""],
+"contact-id" => ["item", ""], 
+"type" => ["item", ""], 
+"wall" => ["item", ""], 
+"gravity" => ["item", ""], 
+"extid" => ["item", ""], 
+"psid" => ["item", ""], 
+"created" => ["item", ""], 
+"edited" => ["item", ""], 
+"commented" => ["item", ""], 
+"received" => ["item", ""], 
+"changed" => ["item", ""], 
+"verb" => ["", ""], 
+"postopts" => ["", ""], 
+"plink" => ["", ""], 
+"resource-id" => ["item", ""], 
+"event-id" => ["item", ""], 
+"attach" => ["item", ""], 
+"inform" => ["", ""], 
+"file" => ["", ""], 
+"allow_cid" => ["", ""], 
+"allow_gid" => ["", ""], 
+"deny_cid" => ["", ""], 
+"deny_gid" => ["", ""], 
+"post-type" => ["item", ""], 
+"private" => ["item", ""], 
+"pubmail" => ["item", ""], 
+"moderated" => ["item", ""], 
+"visible" => ["item", ""], 
+"starred" => ["item", ""], 
+"bookmark" => ["", ""], 
+"unseen" => ["item", ""], 
+"deleted" => ["item", ""], 
+"origin" => ["item", ""], 
+"forum_mode" => ["item", ""], 
+"mention" => ["item", ""], 
+"global" => ["item", ""], 
+"network" => ["item", ""], 
+"title" => ["", ""], 
+"content-warning" => ["", ""], 
+"body" => ["", ""], 
+"location" => ["", ""], 
+"coord" => ["", ""], 
+"app" => ["", ""], 
+"rendered-hash" => ["", ""], 
+"rendered-html" => ["", ""], 
+"object-type" => ["", ""], 
+"object" => ["", ""], 
+"target-type" => ["", ""], 
+"target" => ["", ""], 
+"author-id" => ["item", ""], 
+"author-link" => ["author", ""], 
+"author-name" => ["author", ""], 
+"author-avatar" => ["author", ""], 
+"author-network" => ["author", ""], 
+"owner-id" => ["item", ""], 
+"owner-link" => ["owner", ""], 
+"owner-name" => ["owner", ""], 
+"owner-avatar"  => ["owner", ""]
+*/
+                       "uri-id" => ["post-category", "uri-id"],
+                       "uid" => ["post-category", "uid"],
+                       "uri" => ["item-uri", "uri"],
+                       "guid" => ["item-uri", "guid"],
+                       "type" => ["post-category", "type"],
+                       "tid" => ["post-category", "tid"],
+                       "name" => ["tag", "name"],
+                       "url" => ["tag", "url"],
+               ],
+               "query" => "FROM `item`
+                       LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+                       LEFT JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
+                       LEFT JOIN `contact` AS `owner` ON `owner`.`id` = `item`.`owner-id`
+                       LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`
+                       LEFT JOIN `item-activity` ON `item-activity`.`uri-id` = `item`.`uri-id`
+                       LEFT JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id`
+                       LEFT JOIN `item-delivery-data` ON `item-delivery-data`.`iid` = `item`.`id`
+                       LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`"
+       ],
        "category-view" => [
                "fields" => [
                        "uri-id" => ["post-category", "uri-id"],