diff options
| author | sasiflo <redmatrixdev@sasiflo.de> | 2014-04-06 12:21:24 +0200 |
|---|---|---|
| committer | sasiflo <redmatrixdev@sasiflo.de> | 2014-04-06 12:21:24 +0200 |
| commit | 6d170b2e07f9da8cb67cf0ac4e801b562735e8ae (patch) | |
| tree | ab1d17d8cf72be4f258e0cb9999eaae2cd68dd6a /install | |
| parent | d084d5575cf4df347f2f393319cadb4b1f44f850 (diff) | |
| parent | ad60e2c566930409d853517ca9392f169fc8e747 (diff) | |
| download | volse-hubzilla-6d170b2e07f9da8cb67cf0ac4e801b562735e8ae.tar.gz volse-hubzilla-6d170b2e07f9da8cb67cf0ac4e801b562735e8ae.tar.bz2 volse-hubzilla-6d170b2e07f9da8cb67cf0ac4e801b562735e8ae.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'install')
| -rw-r--r-- | install/database.sql | 2 | ||||
| -rw-r--r-- | install/update.php | 9 |
2 files changed, 9 insertions, 2 deletions
diff --git a/install/database.sql b/install/database.sql index f9562ae09..a5094b8e1 100644 --- a/install/database.sql +++ b/install/database.sql @@ -622,7 +622,7 @@ CREATE TABLE IF NOT EXISTS `notify` ( `aid` int(11) NOT NULL, `uid` int(11) NOT NULL, `link` char(255) NOT NULL, - `parent` int(11) NOT NULL, + `parent` char(255) NOT NULL DEFAULT '', `seen` tinyint(1) NOT NULL DEFAULT '0', `type` int(11) NOT NULL, `verb` char(255) NOT NULL, diff --git a/install/update.php b/install/update.php index d7a87fad4..d497cda70 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1106 ); +define( 'UPDATE_VERSION' , 1107 ); /** * @@ -1182,3 +1182,10 @@ CHANGE `site_sync` `site_sync` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00', return UPDATE_FAILED; } +function update_r1106() { + $r = q("ALTER TABLE `notify` CHANGE `parent` `parent` CHAR( 255 ) NOT NULL DEFAULT ''"); + if($r) + return UPDATE_SUCCESS; + return UPDATE_FAILED; +} + |