diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-06-28 22:33:13 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-06-28 22:33:13 -0700 |
| commit | 63f2e9b41259975f1af6415cda01dc0f81b1af30 (patch) | |
| tree | 01518a9183b0daf02350da8f8e7d853f1a039ffc /install | |
| parent | 8d84472b4cb85b50c314491e0706d80eb5b7de6d (diff) | |
| parent | 090dae46e500634cec8f3718fbb83d5dbb8f9690 (diff) | |
| download | volse-hubzilla-63f2e9b41259975f1af6415cda01dc0f81b1af30.tar.gz volse-hubzilla-63f2e9b41259975f1af6415cda01dc0f81b1af30.tar.bz2 volse-hubzilla-63f2e9b41259975f1af6415cda01dc0f81b1af30.zip | |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/zot.php
mod/connedit.php
util/messages.po
Diffstat (limited to 'install')
| -rw-r--r-- | install/schema_mysql.sql | 2 | ||||
| -rw-r--r-- | install/schema_postgres.sql | 2 | ||||
| -rw-r--r-- | install/update.php | 12 |
3 files changed, 15 insertions, 1 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql index c68261caf..e30eded29 100644 --- a/install/schema_mysql.sql +++ b/install/schema_mysql.sql @@ -21,6 +21,8 @@ CREATE TABLE IF NOT EXISTS `abook` ( `abook_self` tinyint(4) NOT NULL DEFAULT '0', `abook_feed` tinyint(4) NOT NULL DEFAULT '0', `abook_profile` char(64) NOT NULL DEFAULT '', + `abook_incl` TEXT NOT NULL DEFAULT '', + `abook_excl` TEXT NOT NULL DEFAULT '', PRIMARY KEY (`abook_id`), KEY `abook_account` (`abook_account`), KEY `abook_channel` (`abook_channel`), diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql index 7c8d74ae5..b7a699125 100644 --- a/install/schema_postgres.sql +++ b/install/schema_postgres.sql @@ -14,6 +14,8 @@ CREATE TABLE "abook" ( "abook_dob" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00', "abook_flags" bigint NOT NULL DEFAULT '0', "abook_profile" char(64) NOT NULL DEFAULT '', + "abook_incl" TEXT NOT NULL DEFAULT '', + "abook_excl" TEXT NOT NULL DEFAULT '', PRIMARY KEY ("abook_id") ); create index "abook_account" on abook ("abook_account"); diff --git a/install/update.php b/install/update.php index 62c976218..fb49e9a16 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ <?php -define( 'UPDATE_VERSION' , 1143 ); +define( 'UPDATE_VERSION' , 1144 ); /** * @@ -1656,4 +1656,14 @@ function update_r1142() { return UPDATE_FAILED; +} + +function update_r1143() { + + $r1 = q("ALTER TABLE abook ADD abook_incl TEXT NOT NULL DEFAULT ''"); + $r2 = q("ALTER TABLE abook ADD abook_excl TEXT NOT NULL DEFAULT '' "); + if($r1 && $r2) + return UPDATE_SUCCESS; + return UPDATE_FAILED; + }
\ No newline at end of file |