diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-06 12:57:25 +0100 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-02-06 12:57:25 +0100 |
commit | 2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32 (patch) | |
tree | 6935173702da59826d6c7577a927d96a57bc4478 /mod/import.php | |
parent | 2afdba48f06bb99922c19bf964d8f601c1545166 (diff) | |
parent | 021584d782c5bfafaa5ffe26d0c5850c8fffdd8f (diff) | |
download | volse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.tar.gz volse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.tar.bz2 volse-hubzilla-2935c5fe1ad7999d6abf527bfc8e8d353ceb9d32.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'mod/import.php')
-rw-r--r-- | mod/import.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/mod/import.php b/mod/import.php index b6091d944..1a2c87a63 100644 --- a/mod/import.php +++ b/mod/import.php @@ -109,6 +109,9 @@ function import_account(&$a, $account_id) { return; } + if(UNO) + 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); @@ -116,6 +119,12 @@ function import_account(&$a, $account_id) { $t = sprintf( t('Warning: Database versions differ by %1$d updates.'), $v2 - $v1 ); notice($t); } + if(array_key_exists('server_role',$data['compatibility']) + && $data['compatibility']['server_role'] != UNO) { + notice( t('Server platform is not compatible. Operation not permitted.') . EOL); + return; + } + } // import channel |