diff options
| author | Christian Fowler <spider@viovio.com> | 2005-06-29 05:43:41 +0000 |
|---|---|---|
| committer | Christian Fowler <spider@viovio.com> | 2005-06-29 05:43:41 +0000 |
| commit | 5d59979a8999836f5b1eb620dde8c33fa208a9ba (patch) | |
| tree | d905f64f6dc11930dae9fc5d383ab04741f666d8 | |
| parent | 1ac5efd4760ea31cef14335c3ccb64ca256e75b5 (diff) | |
| download | wiki-5d59979a8999836f5b1eb620dde8c33fa208a9ba.tar.gz wiki-5d59979a8999836f5b1eb620dde8c33fa208a9ba.tar.bz2 wiki-5d59979a8999836f5b1eb620dde8c33fa208a9ba.zip | |
Merge recent changes from R1 into HEAD
| -rw-r--r-- | admin/upgrade_inc.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php index 4c0f663..4b37887 100644 --- a/admin/upgrade_inc.php +++ b/admin/upgrade_inc.php @@ -168,6 +168,12 @@ array( 'QUERY' => // update comments on wiki pages "UPDATE `".BIT_DB_PREFIX."tiki_comments` SET `objectType`='".BITPAGE_CONTENT_TYPE_GUID."' WHERE `objectType`='wiki page'", + + // set parent ID = content ID of parent comment + // this will only work correctly for TW DB upgrades, and will corrupt the DB if run more then once + "create temporary table `".BIT_DB_PREFIX."tiki_comments_temp` as (select * from `".BIT_DB_PREFIX."tiki_comments`) ", + "UPDATE `".BIT_DB_PREFIX."tiki_comments` as tc SET `parent_id`=(SELECT i_tcm.`content_id` FROM `".BIT_DB_PREFIX."tiki_content` as i_tcn, `".BIT_DB_PREFIX."tiki_comments_temp` as i_tcm WHERE i_tcm.`content_id` = i_tcn.`content_id` and tc.`parent_id` = i_tcm.`comment_id` ) where parent_id != 0 and `objectType`='".BITPAGE_CONTENT_TYPE_GUID."' ", + // parent ID = 0 indicates a root comment in TW, but now needs to = content ID of wiki page it is the root comment for "UPDATE `".BIT_DB_PREFIX."tiki_comments` SET `parent_id`=(SELECT `content_id` FROM `".BIT_DB_PREFIX."tiki_content` WHERE `content_type_guid`='".BITPAGE_CONTENT_TYPE_GUID."' AND `title`=`".BIT_DB_PREFIX."tiki_comments`.`object` ) WHERE `parent_id`=0 AND `objectType`='".BITPAGE_CONTENT_TYPE_GUID."'", "INSERT INTO `".BIT_DB_PREFIX."tiki_preferences` (`name`, `value`, `package`) VALUES( 'feature_wiki_books', 'y', 'wiki' )", |