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 /install/migrate-mypg.php | |
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
Diffstat (limited to 'install/migrate-mypg.php')
-rw-r--r-- | install/migrate-mypg.php | 4 |
1 files changed, 2 insertions, 2 deletions
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(); |