diff options
| author | RedMatrix <info@friendica.com> | 2015-01-26 11:31:10 +1100 |
|---|---|---|
| committer | RedMatrix <info@friendica.com> | 2015-01-26 11:31:10 +1100 |
| commit | 20d7ed31008acfe0b17b468a270c3184a7e6fe69 (patch) | |
| tree | 73d61fc23350575d2058f9f60f5d77b45b489fbe | |
| parent | 505d530d28065a0cbfacd7d84c121133ebab01aa (diff) | |
| parent | dc259ba027e75ec8ababff322940165613b286ed (diff) | |
| download | volse-hubzilla-20d7ed31008acfe0b17b468a270c3184a7e6fe69.tar.gz volse-hubzilla-20d7ed31008acfe0b17b468a270c3184a7e6fe69.tar.bz2 volse-hubzilla-20d7ed31008acfe0b17b468a270c3184a7e6fe69.zip | |
Merge pull request #878 from habeascodice/master
ping @mike
| -rw-r--r-- | include/zot.php | 2 | ||||
| -rw-r--r-- | install/migrate-mypg.php | 4 | ||||
| -rw-r--r-- | install/migrate_mypg_fixseq.sql | 2 |
3 files changed, 4 insertions, 4 deletions
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; |