Changeset 2564 for branches/release-40/lib/MT/BackupRestore/BackupFileHandler.pm

Timestamp:

06/13/08 03:20:08 (18 months ago)

Author:

fumiakiy

Message:

Do not proceed restoring from the backup which was from *different* version of MT (not just newer, but different version would not be allowed). BugId:80102

Files:

• branches/release-40/lib/MT/BackupRestore/BackupFileHandler.pm (modified) (2 diffs)

branches/release-40/lib/MT/BackupRestore/BackupFileHandler.pm

@@ -42 +42 @@
         die MT->translate('Uploaded file was not a valid Movable Type backup manifest file.')
             if !(('movabletype' eq $name) && (MT::BackupRestore::NS_MOVABLETYPE() eq $ns));
-        unless ($self->{ignore_schema_conflicts}) {
+        #unless ($self->{ignore_schema_conflicts}) {
             my $schema = $attrs->{'{}schema_version'}->{Value};
-            if (('ignore' ne $self->{schema_version}) && ($schema > $self->{schema_version})) {
+            #if (('ignore' ne $self->{schema_version}) && ($schema > $self->{schema_version})) {
+            if ( $schema != $self->{schema_version} ) {
                 $self->{critical} = 1;
-                my $message = MT->translate('Uploaded file was backed up from Movable Type with the newer schema version ([_1]) than the one in this system ([_2]).  It is not safe to restore the file to this version of Movable Type.', MT::I18N::encode_text(MT::I18N::utf8_off($schema), 'utf-8'), $self->{schema_version});
+                my $message = MT->translate('Uploaded file was backed up from Movable Type but the different schema version ([_1]) from the one in this system ([_2]).  It is not safe to restore the file to this version of Movable Type.', MT::I18N::encode_text(MT::I18N::utf8_off($schema), 'utf-8'), $self->{schema_version});
                 MT->log({ 
                     message => $message,
@@ -55 +56 @@
                 die $message;
             }
-        }
+        #}
         $self->{start} = 0;
         return 1;