diff options
| author | friendica <info@friendica.com> | 2015-01-26 17:10:05 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-26 17:10:05 -0800 |
| commit | 9f5bfca28dde23893156ad36682e20ca2fc0dd45 (patch) | |
| tree | ae2ae0eb38458287e2f607db2cacacff50c676a9 | |
| parent | d73972e8e26d2155a49ef7fe01dda0af85112e09 (diff) | |
| parent | aa24d6c8e58f91fadead5cedd8a332aaec1ea64a (diff) | |
| download | volse-hubzilla-9f5bfca28dde23893156ad36682e20ca2fc0dd45.tar.gz volse-hubzilla-9f5bfca28dde23893156ad36682e20ca2fc0dd45.tar.bz2 volse-hubzilla-9f5bfca28dde23893156ad36682e20ca2fc0dd45.zip | |
Merge https://github.com/friendica/red into pending_merge
| -rw-r--r-- | doc/main.bb | 1 | ||||
| -rw-r--r-- | include/zot.php | 2 | ||||
| -rw-r--r-- | install/migrate-mypg.php | 4 | ||||
| -rw-r--r-- | install/migrate_mypg_fixseq.sql | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/doc/main.bb b/doc/main.bb index e7fd2894c..1fd234420 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -78,6 +78,7 @@ Zot is the great new communicaton protocol invented especially for the RedMatrix [url=https://github.com/friendica/red]Main Website[/url]
[url=https://github.com/friendica/red-addons]Addon Website[/url]
[url=https://zothub.com/channel/one]Development Channel[/url]
+[url=https://federated.social/channel/postgres]Postgres-specific RedMatrix Admin Support Channel[/url]
[url=[baseurl]/help/credits]RedMatrix Credits[/url]
diff --git a/include/zot.php b/include/zot.php index 3d92f7824..780c6a265 100644 --- a/include/zot.php +++ b/include/zot.php @@ -2919,7 +2919,7 @@ function zot_process_message_request($data) { $r = q("select hubloc_guid, hubloc_url, hubloc_sitekey, hubloc_network, hubloc_flags, hubloc_callback, hubloc_host from hubloc where hubloc_hash = '%s' and not (hubloc_flags & %d)>0 - and not (hubloc_status & %d)>0 group by hubloc_sitekey", + and not (hubloc_status & %d)>0 ", dbesc($sender_hash), intval(HUBLOC_FLAGS_DELETED), intval(HUBLOC_OFFLINE) diff --git a/install/migrate-mypg.php b/install/migrate-mypg.php index 10bf1e387..cfd4f681a 100644 --- a/install/migrate-mypg.php +++ b/install/migrate-mypg.php @@ -33,7 +33,7 @@ function parse_htconfig($file) { function get_configtype(array $data) { if(!isset($data['host'], $data['user'], $data['pass'], $data['data'])) return 'none'; - if($data['type'] == 1) + if(@$data['type'] == 1) return 'pgsql'; return 'mysql'; } @@ -112,7 +112,7 @@ foreach(array('install','include','mod','view') as $dir) { } $cfgfile = '.htconfig.php'; -if($argv[1] == '--resume') { +if($argc >= 2 && $argv[1] == '--resume') { if($argc < 4) { echo "Resume usage {$argv[0]} --resume <table> <row>\n"; exit(); diff --git a/install/migrate_mypg_fixseq.sql b/install/migrate_mypg_fixseq.sql index 806c5cf31..fde187dc7 100644 --- a/install/migrate_mypg_fixseq.sql +++ b/install/migrate_mypg_fixseq.sql @@ -52,4 +52,4 @@ SELECT SETVAL('public.xign_id_seq', COALESCE(MAX(id), 1) ) FROM public.xign; SELECT SETVAL('public.xlink_xlink_id_seq', COALESCE(MAX(xlink_id), 1) ) FROM public.xlink; SELECT SETVAL('public.xtag_xtag_id_seq', COALESCE(MAX(xtag_id), 1) ) FROM public.xtag; - + SELECT SETVAL('public.xperm_xp_id_seq', COALESCE(MAX(xp_id), 1) ) FROM public.xperm; |