diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-03-12 09:37:29 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-03-12 09:37:29 +0100 |
| commit | b265a55b815e46658aadec9021bb00997cb40bc7 (patch) | |
| tree | 699000bdfe3f076ceaf92e2a2147ab1856c0f5e7 /Zotlabs/Module/Import.php | |
| parent | ade11568f9dc094b124a442914d107cd3235f6e8 (diff) | |
| parent | 717ae5486806f7f238f6cdafe08c8aefd94056d2 (diff) | |
| download | volse-hubzilla-b265a55b815e46658aadec9021bb00997cb40bc7.tar.gz volse-hubzilla-b265a55b815e46658aadec9021bb00997cb40bc7.tar.bz2 volse-hubzilla-b265a55b815e46658aadec9021bb00997cb40bc7.zip | |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'Zotlabs/Module/Import.php')
| -rw-r--r-- | Zotlabs/Module/Import.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index 36bd72310..81c405f00 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -114,15 +114,16 @@ class Import extends \Zotlabs\Web\Controller { return; } - if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) { - $v1 = substr($data['compatibility']['database'],-4); - $v2 = substr(DB_UPDATE_VERSION,-4); - if($v2 > $v1) { - $t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 ); - notice($t); - } - - } +// This is only an info message but it is alarming to folks who then report failure with this as the cause, when in fact we ignore this completely. +// if(array_key_exists('compatibility',$data) && array_key_exists('database',$data['compatibility'])) { +// $v1 = substr($data['compatibility']['database'],-4); +// $v2 = substr(DB_UPDATE_VERSION,-4); +// if($v2 > $v1) { +// $t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 ); +// notice($t); +// } +// +// } if($moving) $seize = 1; |