diff options
| author | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-09 21:32:25 +0100 |
|---|---|---|
| committer | Thomas Willingham <beardyunixer@beardyunixer.com> | 2014-09-09 21:32:25 +0100 |
| commit | ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687 (patch) | |
| tree | cf1aa37d881f2ce3cb844bbcd5c11c5999e96c66 /install | |
| parent | 652ec8c3fcc956c1a5fc2adb7410e4c4a2ac6f90 (diff) | |
| parent | 409c89d629993b59eaafa8443ae9d0b5f0344c1f (diff) | |
| download | volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.gz volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.bz2 volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'install')
| -rw-r--r-- | install/database.sql | 1 | ||||
| -rw-r--r-- | install/update.php | 11 |
2 files changed, 11 insertions, 1 deletions
diff --git a/install/database.sql b/install/database.sql index c773fab10..a49bd377c 100644 --- a/install/database.sql +++ b/install/database.sql @@ -535,6 +535,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `resource_type` char(16) NOT NULL DEFAULT '', `attach` mediumtext NOT NULL DEFAULT '', `sig` text NOT NULL DEFAULT '', + `diaspora_meta` mediumtext NOT NULL DEFAULT '', `location` char(255) NOT NULL DEFAULT '', `coord` char(255) NOT NULL DEFAULT '', `public_policy` char(255) NOT NULL DEFAULT '', diff --git a/install/update.php b/install/update.php index 92cb200a3..0b1fa5d2e 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1128 ); +define( 'UPDATE_VERSION' , 1129 ); /** * @@ -1448,3 +1448,12 @@ ADD INDEX ( `comments_closed` ), ADD INDEX ( `changed` ) "); return UPDATE_FAILED; } + +function update_r1128() { + $r = q("ALTER TABLE `item` ADD `diaspora_meta` MEDIUMTEXT NOT NULL DEFAULT '' AFTER `sig` "); + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; + +} + |