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