Changeset 2564 for branches/release-40/lib/MT/CMS/Tools.pm
- Timestamp:
- 06/13/08 03:20:08 (18 months ago)
- Files:
-
- 1 modified
-
branches/release-40/lib/MT/CMS/Tools.pm (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/release-40/lib/MT/CMS/Tools.pm
r2498 r2564 1597 1597 my ( $fh, $errormsg ) = @_; 1598 1598 my $q = $app->param; 1599 my $schema_version = 1600 $q->param('ignore_schema_conflict') 1601 ? 'ignore' 1602 : $app->config('SchemaVersion'); 1599 my $schema_version = $app->config->SchemaVersion; 1600 #my $schema_version = 1601 # $q->param('ignore_schema_conflict') 1602 # ? 'ignore' 1603 # : $app->config('SchemaVersion'); 1603 1604 my $overwrite_template = $q->param('overwrite_global_templates') ? 1 : 0; 1604 1605 … … 1655 1656 1656 1657 my $q = $app->param; 1657 my $schema_version = 1658 $q->param('ignore_schema_conflict') 1659 ? 'ignore' 1660 : $app->config('SchemaVersion'); 1658 my $schema_version = $app->config->SchemaVersion; 1659 #my $schema_version = 1660 # $q->param('ignore_schema_conflict') 1661 # ? 'ignore' 1662 # : $app->config('SchemaVersion'); 1661 1663 1662 1664 my $overwrite_template = $q->param('overwrite_global_templates') ? 1 : 0; … … 1764 1766 $param->{last} = scalar(@$files) ? 0 : ( scalar(@$assets) ? 0 : 1 ); 1765 1767 $param->{open_dialog} = 1; 1766 $param->{schema_version} = 1767 $q->param('ignore_schema_conflict') 1768 ? 'ignore' 1769 : $app->config('SchemaVersion'); 1768 $param->{schema_version} = $app->config->SchemaVersion; 1769 #$param->{schema_version} = 1770 # $q->param('ignore_schema_conflict') 1771 # ? 'ignore' 1772 # : $app->config('SchemaVersion'); 1770 1773 $param->{overwrite_templates} = $q->param('overwrite_global_templates') ? 1 : 0; 1771 1774
