trim expects error ... in admin/site

This commit is contained in:
zotlabs
2018-03-10 13:20:20 -08:00
parent 3ee35b83c2
commit a417389934
3 changed files with 20 additions and 13 deletions

View File

@@ -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;