This isn't optimal, but on the short term we'll clone the page editor to use as a block editor, and probably a layout editor as well. Eventually, these should all probably just be switches onto a single editor instance. Decided to put the layout_mid into the item table directory rather than re-use resource_id, so that we can still have pages attached to different resources like photos and events and stuff. The block editor is far from finished, at this point I've only cloned it and changed the name and type of item it looks for.

2 files changed, 10 insertions, 3 deletions

diff --git a/install/database.sql b/install/database.sql
index 2f92167c8..176b3610f 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -408,7 +408,6 @@ CREATE TABLE IF NOT EXISTS `item` (
   `mid` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
   `aid` int(10) unsigned NOT NULL DEFAULT '0',
   `uid` int(10) unsigned NOT NULL DEFAULT '0',
-  `wall` tinyint(1) NOT NULL DEFAULT '0',
   `parent` int(10) unsigned NOT NULL DEFAULT '0',
   `parent_mid` char(255) CHARACTER SET ascii NOT NULL DEFAULT '',
   `thr_parent` char(255) NOT NULL DEFAULT '',
@@ -431,6 +430,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   `object` text NOT NULL,
   `tgt_type` char(255) NOT NULL DEFAULT '',
   `target` text NOT NULL,
+  `layout_mid` char(255) NOT NULL DEFAULT '',
   `postopts` text NOT NULL,
   `llink` char(255) NOT NULL DEFAULT '',
   `plink` char(255) NOT NULL DEFAULT '',
@@ -454,7 +454,6 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `created` (`created`),
   KEY `edited` (`edited`),
   KEY `received` (`received`),
-  KEY `wall` (`wall`),
   KEY `uid_commented` (`uid`,`commented`),
   KEY `uid_created` (`uid`,`created`),
   KEY `aid` (`aid`),
@@ -474,6 +473,7 @@ CREATE TABLE IF NOT EXISTS `item` (
   KEY `parent_mid` (`parent_mid`),
   KEY `uid_mid` (`mid`,`uid`),
   KEY `comment_policy` (`comment_policy`),
+  KEY `layout_mid` (`layout_mid`),
   FULLTEXT KEY `title` (`title`),
   FULLTEXT KEY `body` (`body`),
   FULLTEXT KEY `allow_cid` (`allow_cid`),
diff --git a/install/update.php b/install/update.php
index 13dded6fe..4f004e651 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1065 );
+define( 'UPDATE_VERSION' , 1066 );
 
 /**
  *
@@ -759,3 +759,10 @@ ADD INDEX ( `ud_guid` )");
 	return UPDATE_FAILED;
 }
 
+function update_r1065() {
+	$r = q("ALTER TABLE `item` DROP `wall`, ADD `layout_mid` CHAR( 255 ) NOT NULL DEFAULT '' AFTER `target` ,
+ADD INDEX ( `layout_mid` ) ");
+	if($r)
+		return UPDATE_SUCCESS;
+	return UPDATE_FAILED;
+}