diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-10-06 15:00:40 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-10-06 15:00:40 +0200 |
| commit | 3f57609b75e93df8778f04ffc7b3ba2bddc713a9 (patch) | |
| tree | aa5d43655c31f41dda7907972e08431d3dedd99f | |
| parent | 9850d1842087d1842d9360ed5fd3bdea74e575c9 (diff) | |
| parent | 778086ce199c38be793ed59e03eb0446af9263ec (diff) | |
| download | volse-hubzilla-3f57609b75e93df8778f04ffc7b3ba2bddc713a9.tar.gz volse-hubzilla-3f57609b75e93df8778f04ffc7b3ba2bddc713a9.tar.bz2 volse-hubzilla-3f57609b75e93df8778f04ffc7b3ba2bddc713a9.zip | |
merge branch 'dev' of https://framagit.org/hubzilla/core into dev
| -rw-r--r-- | Zotlabs/Module/Import.php | 4 | ||||
| -rw-r--r-- | doc/database.bb | 4 | ||||
| -rw-r--r-- | doc/database/db_pgrp.bb (renamed from doc/database/db_groups.bb) | 0 | ||||
| -rw-r--r-- | doc/database/db_pgrp_member.bb (renamed from doc/database/db_group_member.bb) | 0 | ||||
| -rw-r--r-- | doc/intro_for_developers.bb | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index c5c52674a..6016328a5 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -426,7 +426,7 @@ class Import extends \Zotlabs\Web\Controller { unset($group['id']); $group['uid'] = $channel['channel_id']; - create_table_from_array('groups', $group); + create_table_from_array('pgrp', $group); } $r = q("select * from pgrp where uid = %d", intval($channel['channel_id']) @@ -448,7 +448,7 @@ class Import extends \Zotlabs\Web\Controller { if($x['old'] == $group_member['gid']) $group_member['gid'] = $x['new']; } - create_table_from_array('group_member', $group_member); + create_table_from_array('pgrp_member', $group_member); } } diff --git a/doc/database.bb b/doc/database.bb index 160ec505e..a72081e4a 100644 --- a/doc/database.bb +++ b/doc/database.bb @@ -16,8 +16,8 @@ [tr][td][zrl=[baseurl]/help/database/db_config]config[/zrl][/td][td]main configuration storage[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_conv]conv[/zrl][/td][td]Diaspora private messages meta conversation structure[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_event]event[/zrl][/td][td]Events[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_group_member]group_member[/zrl][/td][td]privacy groups (collections), group info[/td][/tr] -[tr][td][zrl=[baseurl]/help/database/db_groups]groups[/zrl][/td][td]privacy groups (collections), member info[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_pgrp_member]pgrp_member[/zrl][/td][td]privacy groups (collections), group info[/td][/tr] +[tr][td][zrl=[baseurl]/help/database/db_pgrp]pgrp[/zrl][/td][td]privacy groups (collections), member info[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_hook]hook[/zrl][/td][td]plugin hook registry[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_hubloc]hubloc[/zrl][/td][td]xchan location storage, ties a hub location to an xchan[/td][/tr] [tr][td][zrl=[baseurl]/help/database/db_iconfig]iconfig[/zrl][/td][td]extensible arbitrary storage for items[/td][/tr] diff --git a/doc/database/db_groups.bb b/doc/database/db_pgrp.bb index 73265b90e..73265b90e 100644 --- a/doc/database/db_groups.bb +++ b/doc/database/db_pgrp.bb diff --git a/doc/database/db_group_member.bb b/doc/database/db_pgrp_member.bb index b9ab8171d..b9ab8171d 100644 --- a/doc/database/db_group_member.bb +++ b/doc/database/db_pgrp_member.bb diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb index 6ef7a4d9e..172008b7f 100644 --- a/doc/intro_for_developers.bb +++ b/doc/intro_for_developers.bb @@ -55,8 +55,8 @@ [li]ffinder - friend suggestion stuff[/li] [li]fserver - obsolete[/li] [li]fsuggest - friend suggestion stuff[/li] - [li]groups - privacy groups[/li] - [li]group_member - privacy groups[/li] + [li]pgrp - privacy groups[/li] + [li]pgrp_member - privacy groups[/li] [li]hook - plugin hook registry[/li] [li]hubloc - Red location storage, ties a location to an xchan[/li] [li]item - posts[/li] |