aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-02-25 14:13:26 -0800
committerfriendica <info@friendica.com>2014-02-25 14:13:26 -0800
commit8fd12eb122b2ca45f71ff30ce02f2544bed15a85 (patch)
tree019c9a299ed169b69c2cf8b1805bb3e5b376f6fb /install
parent08313bac6c7ce9f87b6b6ddf23cc5c4d50747aa1 (diff)
parent36085bc608e08376ce936e35bdcc9440b49a77c2 (diff)
downloadvolse-hubzilla-8fd12eb122b2ca45f71ff30ce02f2544bed15a85.tar.gz
volse-hubzilla-8fd12eb122b2ca45f71ff30ce02f2544bed15a85.tar.bz2
volse-hubzilla-8fd12eb122b2ca45f71ff30ce02f2544bed15a85.zip
Merge https://github.com/friendica/red into zpull
Diffstat (limited to 'install')
-rw-r--r--install/database.sql24
-rw-r--r--install/update.php22
2 files changed, 32 insertions, 14 deletions
diff --git a/install/database.sql b/install/database.sql
index cd31a0285..ac35f9bc3 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -160,18 +160,18 @@ CREATE TABLE IF NOT EXISTS `channel` (
`channel_allow_gid` mediumtext NOT NULL,
`channel_deny_cid` mediumtext NOT NULL,
`channel_deny_gid` mediumtext NOT NULL,
- `channel_r_stream` tinyint(3) unsigned NOT NULL DEFAULT '128',
- `channel_r_profile` tinyint(3) unsigned NOT NULL DEFAULT '128',
- `channel_r_photos` tinyint(3) unsigned NOT NULL DEFAULT '128',
- `channel_r_abook` tinyint(3) unsigned NOT NULL DEFAULT '128',
- `channel_w_stream` tinyint(3) unsigned NOT NULL DEFAULT '128',
- `channel_w_wall` tinyint(3) unsigned NOT NULL DEFAULT '128',
- `channel_w_tagwall` tinyint(3) unsigned NOT NULL DEFAULT '128',
- `channel_w_comment` tinyint(3) unsigned NOT NULL DEFAULT '128',
- `channel_w_mail` tinyint(3) unsigned NOT NULL DEFAULT '128',
- `channel_w_photos` tinyint(3) unsigned NOT NULL DEFAULT '128',
- `channel_w_chat` tinyint(3) unsigned NOT NULL DEFAULT '128',
- `channel_a_delegate` tinyint(3) unsigned NOT NULL DEFAULT '0',
+ `channel_r_stream` int(10) unsigned NOT NULL DEFAULT '128',
+ `channel_r_profile` int(10) unsigned NOT NULL DEFAULT '128',
+ `channel_r_photos` int(10) unsigned NOT NULL DEFAULT '128',
+ `channel_r_abook` int(10) unsigned NOT NULL DEFAULT '128',
+ `channel_w_stream` int(10) unsigned NOT NULL DEFAULT '128',
+ `channel_w_wall` int(10) unsigned NOT NULL DEFAULT '128',
+ `channel_w_tagwall` int(10) unsigned NOT NULL DEFAULT '128',
+ `channel_w_comment` int(10) unsigned NOT NULL DEFAULT '128',
+ `channel_w_mail` int(10) unsigned NOT NULL DEFAULT '128',
+ `channel_w_photos` int(10) unsigned NOT NULL DEFAULT '128',
+ `channel_w_chat` int(10) unsigned NOT NULL DEFAULT '128',
+ `channel_a_delegate` int(10) unsigned NOT NULL DEFAULT '0',
`channel_r_storage` int(10) unsigned NOT NULL DEFAULT '128',
`channel_w_storage` int(10) unsigned NOT NULL DEFAULT '128',
`channel_r_pages` int(10) unsigned NOT NULL DEFAULT '128',
diff --git a/install/update.php b/install/update.php
index 7d1305863..9ad74fec4 100644
--- a/install/update.php
+++ b/install/update.php
@@ -1,6 +1,6 @@
<?php
-define( 'UPDATE_VERSION' , 1098 );
+define( 'UPDATE_VERSION' , 1099 );
/**
*
@@ -1099,4 +1099,22 @@ function update_r1097() {
}
return UPDATE_SUCCESS;
-} \ No newline at end of file
+}
+
+function update_r1098() {
+ $r = q("ALTER TABLE `channel` CHANGE `channel_r_stream` `channel_r_stream` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+ $r2 = q("ALTER TABLE `channel` CHANGE `channel_r_profile` `channel_r_profile` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+ $r3 = q("ALTER TABLE `channel` CHANGE `channel_r_photos` `channel_r_photos` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+ $r4 = q("ALTER TABLE `channel` CHANGE `channel_r_abook` `channel_r_abook` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+ $r4 = q("ALTER TABLE `channel` CHANGE `channel_w_stream` `channel_w_stream` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+ $r5 = q("ALTER TABLE `channel` CHANGE `channel_w_wall` `channel_w_wall` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+ $r6 = q("ALTER TABLE `channel` CHANGE `channel_w_tagwall` `channel_w_tagwall` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+ $r7 = q("ALTER TABLE `channel` CHANGE `channel_w_comment` `channel_w_comment` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+ $r8 = q("ALTER TABLE `channel` CHANGE `channel_w_mail` `channel_w_mail` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+ $r9 = q("ALTER TABLE `channel` CHANGE `channel_w_photos` `channel_w_photos` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+ $r10 = q("ALTER TABLE `channel` CHANGE `channel_w_chat` `channel_w_chat` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+ $r11 = q("ALTER TABLE `channel` CHANGE `channel_a_delegate` `channel_a_delegate` INT( 10 ) UNSIGNED NOT NULL DEFAULT '0'");
+ if($r && $r2 && $r3 && $r3 && $r5 && $r6 && $r7 && $r8 && $r9 && $r9 && $r10 && $r11)
+ return UPDATE_SUCCESS;
+ return UPDATE_FAILED;
+}