harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #878 from habeascodice/master

Browse Source 
ping @mike
This commit is contained in:
RedMatrix 2015-01-26 11:31:10 +11:00
commit 20d7ed3100
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/zot.php
View File

@ -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 $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 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), dbesc($sender_hash),
intval(HUBLOC_FLAGS_DELETED), intval(HUBLOC_FLAGS_DELETED),
intval(HUBLOC_OFFLINE) intval(HUBLOC_OFFLINE)

4
install/migrate-mypg.php
View File

@ -33,7 +33,7 @@ function parse_htconfig($file) {
function get_configtype(array $data) { function get_configtype(array $data) {
if(!isset($data['host'], $data['user'], $data['pass'], $data['data'])) if(!isset($data['host'], $data['user'], $data['pass'], $data['data']))
return 'none'; return 'none';
if($data['type'] == 1) if(@$data['type'] == 1)
return 'pgsql'; return 'pgsql';
return 'mysql'; return 'mysql';
} }
@ -112,7 +112,7 @@ foreach(array('install','include','mod','view') as $dir) {
} }
$cfgfile = '.htconfig.php'; $cfgfile = '.htconfig.php';
if($argv[1] == '--resume') { if($argc >= 2 && $argv[1] == '--resume') {
if($argc < 4) { if($argc < 4) {
echo "Resume usage {$argv[0]} --resume <table> <row>\n"; echo "Resume usage {$argv[0]} --resume <table> <row>\n";
exit(); exit();

2
install/migrate_mypg_fixseq.sql
View File

@ -52,4 +52,4 @@
SELECT SETVAL('public.xign_id_seq', COALESCE(MAX(id), 1) ) FROM public.xign; 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.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.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;