summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorMax Kremmel <xing@synapse.plus.com>2006-01-20 11:06:48 +0000
committerMax Kremmel <xing@synapse.plus.com>2006-01-20 11:06:48 +0000
commit79606361711fa386745d247829a3c506106b5a1f (patch)
tree9f0444999bbd948db64920ed7c4b9dd251c011d7 /admin
parent6a6b82ceb48d2b934c650dc725c7619beaa6dbab (diff)
downloadblogs-79606361711fa386745d247829a3c506106b5a1f.tar.gz
blogs-79606361711fa386745d247829a3c506106b5a1f.tar.bz2
blogs-79606361711fa386745d247829a3c506106b5a1f.zip
merge recent changes into HEAD
Diffstat (limited to 'admin')
-rw-r--r--admin/upgrade_inc.php16
1 files changed, 14 insertions, 2 deletions
diff --git a/admin/upgrade_inc.php b/admin/upgrade_inc.php
index cebaca2..8e7f84d 100644
--- a/admin/upgrade_inc.php
+++ b/admin/upgrade_inc.php
@@ -6,8 +6,20 @@ require_once( BLOGS_PKG_PATH.'BitBlogPost.php' );
$upgrades = array(
+'TIKIWIKI19' => array (
+ 'TIKIWIKI18' => array (
+/* Sliced and diced TW 1.9 upgrade scripts that did actual schema alterations
+
+ALTER TABLE `tiki_blog_posts` ADD `priv` VARCHAR( 1 );
+ALTER TABLE `tiki_blogs` ADD `show_avatar` char(1) default NULL;
+ALTER TABLE tiki_blog_posts MODIFY data_size int(11) unsigned NOT NULL default '0';
+
+*/
+ )
+),
+
'BONNIE' => array(
- 'CLYDE' => array(
+ 'BWR1' => array(
// STEP 1
array( 'DATADICT' => array(
@@ -75,7 +87,7 @@ array( 'PHP' => '
// STEP 4
array( 'QUERY' =>
array( 'SQL92' => array(
- // Update Blog Post comments - we have no Blog level comments in CLYDE
+ // Update Blog Post comments - we have no Blog level comments in BWR1
"UPDATE `".BIT_DB_PREFIX."tiki_comments` SET `objectType`='".BITBLOGPOST_CONTENT_TYPE_GUID."' WHERE `objectType`='post'",
"UPDATE `".BIT_DB_PREFIX."tiki_comments` SET `parent_id`=(SELECT `content_id` FROM `".BIT_DB_PREFIX."tiki_blog_posts` WHERE `post_id`=`".BIT_DB_PREFIX."tiki_comments`.`object`) WHERE `parent_id`=0 AND `objectType`='".BITBLOGPOST_CONTENT_TYPE_GUID."'",
),