diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index 0e581636d..f5fad6046 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -116,16 +116,10 @@ class Import extends \Zotlabs\Web\Controller { return; } -// 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((! array_path_exists('compatibility/codebase',$data)) || $data['compatibility']['codebase'] !== 'zap') { + notice('Data export format is not compatible with this software'); + return; + } if($moving) $seize = 1; diff --git a/include/channel.php b/include/channel.php index c5e2d54be..9704d436e 100644 --- a/include/channel.php +++ b/include/channel.php @@ -758,6 +758,7 @@ function identity_basic_export($channel_id, $sections = null) { $ret['compatibility'] = [ 'project' => PLATFORM_NAME, + 'codebase' => 'zap', 'version' => STD_VERSION, 'database' => DB_UPDATE_VERSION, 'server_role' => Zotlabs\Lib\System::get_server_role()