Changeset 962
- Timestamp:
- 12/20/06 11:49:08 (2 years ago)
- Files:
-
- branches/wheeljack/lib/MT/App/CMS.pm (modified) (1 diff)
- branches/wheeljack/lib/MT/BackupRestore.pm (modified) (2 diffs)
- branches/wheeljack/lib/MT/BackupRestore/BackupFileHandler.pm (modified) (3 diffs)
- branches/wheeljack/lib/MT/BackupRestore/ManifestFileHandler.pm (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/wheeljack/lib/MT/App/CMS.pm
r961 r962 11314 11314 return 0; 11315 11315 } 11316 if ($ errormsg) {11316 if ($$errormsg) { 11317 11317 $app->log({ 11318 message => $ errormsg,11318 message => $$errormsg, 11319 11319 level => MT::Log::ERROR(), 11320 11320 class => 'system', branches/wheeljack/lib/MT/BackupRestore.pm
r951 r962 327 327 my $voldir = "$vol$dir"; 328 328 # we do need decode_utf8 here 329 $errors->{$id} = MT ::I18N::decode_utf8(MT->translate('[_1] is not writable.',$voldir));329 $errors->{$id} = MT->translate('[_1] is not writable.', MT::I18N::utf8_off($voldir)); 330 330 } else { 331 331 my $filename = "$id-" . $asset_element->{name}; … … 847 847 sub parent_names { 848 848 my $obj = shift; 849 { author => 'MT::Author', blog => 'MT::Blog' }; 849 my $parents = { 850 author => 'MT::Author', 851 blog => 'MT::Blog' 852 }; 853 $parents; 850 854 } 851 855 branches/wheeljack/lib/MT/BackupRestore/BackupFileHandler.pm
r951 r962 86 86 87 87 my $obj = $class->new; 88 my %column_data = map { $attrs->{$_}->{LocalName} => $attrs->{$_}->{Value} } keys(%$attrs); 89 $obj->set_values(\%column_data); 88 my %column_data = map { $attrs->{$_}->{LocalName} => 89 MT::I18N::encode_text(MT::I18N::utf8_off($attrs->{$_}->{Value}), 'utf-8') 90 } keys(%$attrs); 90 91 $callback->(MT->translate("Restoring [_1]...\n", $class)); 91 92 my $success = $obj->restore_parent_ids(\%column_data, $objects); 92 93 if ($success) { 94 $obj->set_values(\%column_data); 93 95 $self->{current} = $obj; 94 96 } else { 95 $callback->(MT->translate("Restoring [_1] (ID: [_2]) was deferred because its parents objects have not been restored yet.\n", $class, $column_data{id})); 97 $callback->( 98 MT->translate("Restoring [_1] (ID: [_2]) was deferred because its parents objects have not been restored yet.\n", 99 $class, $column_data{id}) 100 ); 96 101 $deferred->{$class . '#' . $column_data{id}} = 1; 97 102 $self->{deferred} = $deferred; … … 113 118 return if $self->{skip}; 114 119 return if !exists($self->{current}); 115 use Data::Dumper;116 120 if (my $text_data = $self->{current_text}) { 117 121 push @$text_data, $data->{Data}; … … 135 139 my $text; 136 140 $text .= $_ foreach @{$self->{current_text}}; 141 $text = MT::I18N::encode_text(MT::I18N::utf8_off($text), 'utf-8'); 137 142 $obj->column($column_name, $text); 138 143 delete $self->{current_text}; branches/wheeljack/lib/MT/BackupRestore/ManifestFileHandler.pm
r951 r962 41 41 my $name = $data->{LocalName}; 42 42 my %attrs = map { 43 $data->{Attributes}->{$_}->{LocalName} => $data->{Attributes}->{$_}->{Value} 43 $data->{Attributes}->{$_}->{LocalName} => 44 MT::I18N::encode_text(MT::I18N::utf8_off($data->{Attributes}->{$_}->{Value}), 'utf-8') 44 45 } keys(%{$data->{Attributes}}); 45 46 my $ns = $data->{NamespaceURI};
