Changeset 2049
- Timestamp:
- 04/23/08 06:26:24 (7 months ago)
- Files:
-
- branches/release-36/build/mt-dists/default.mk (modified) (1 diff)
- branches/release-36/lib/MT/CMS/Template.pm (modified) (5 diffs)
- branches/release-36/lib/MT/Template.pm (modified) (1 diff)
- branches/release-36/lib/MT/Template/ContextHandlers.pm (modified) (2 diffs)
- branches/release-36/lib/MT/Upgrade.pm (modified) (1 diff)
- branches/release-36/php/lib/mtdb_base.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/release-36/build/mt-dists/default.mk
r2033 r2049 2 2 3 3 PRODUCT_VERSION = 4.15 4 SCHEMA_VERSION = 4.005 84 SCHEMA_VERSION = 4.0059 5 5 API_VERSION = 4.15 6 6 branches/release-36/lib/MT/CMS/Template.pm
r2047 r2049 477 477 $param->{include_with_ssi} = 0; 478 478 $param->{cache_path} = ''; 479 $param->{cache_enabled} = 0;480 479 $param->{cache_expire_type} = 0; 481 480 $param->{cache_expire_period} = ''; … … 488 487 $param->{cache_path} = $obj->cache_path 489 488 if defined $obj->cache_path; 490 $param->{cache_enabled} = $obj->use_cache491 if defined $obj->use_cache;492 489 $param->{cache_expire_type} = $obj->cache_expire_type 493 490 if defined $obj->cache_expire_type; … … 562 559 $template_type = 'system'; 563 560 } 564 $row->{use_cache} = $obj->use_cache? 1 : 0;561 $row->{use_cache} = ( $obj->cache_expire_type != 0 ) ? 1 : 0; 565 562 $row->{template_type} = $template_type; 566 563 $row->{type} = 'entry' if $type eq 'individual'; … … 1239 1236 $obj->include_with_ssi( $app->param('include_with_ssi') ? 1 : 0 ); 1240 1237 $obj->cache_path( $app->param('cache_path')); 1241 $obj->use_cache( $app->param('cache_enabled') ? 1 : 0 );1242 1238 my $cache_expire_type = $app->param('cache_expire_type'); 1243 1239 $obj->cache_expire_type($cache_expire_type); … … 1411 1407 my $published_url = $tmpl->published_url; 1412 1408 $row->{published_url} = $published_url if $published_url; 1413 $row->{use_cache} = $tmpl->use_cache? 1 : 0;1409 $row->{use_cache} = ( $tmpl->cache_expire_type != 0 ) ? 1 : 0; 1414 1410 1415 1411 # FIXME: enumeration of types branches/release-36/lib/MT/Template.pm
r1959 r2049 40 40 'page_layout' => 'string meta', 41 41 'include_with_ssi' => 'integer meta', 42 'use_cache' => 'integer meta',43 42 'cache_expire_type' => 'integer meta', 44 43 'cache_expire_interval' => 'integer meta', branches/release-36/lib/MT/Template/ContextHandlers.pm
r2033 r2049 2389 2389 || $arg->{key} 2390 2390 || ( exists $arg->{ttl} ) 2391 || $tmpl->use_cache) ? 1 : 0;2391 || ( $tmpl->cache_expire_type != 0 ) ) ? 1 : 0; 2392 2392 my $cache_key = 2393 2393 ($arg->{cache_key} || $arg->{key}) … … 2396 2396 my $ttl = 2397 2397 exists $arg->{ttl} ? $arg->{ttl} 2398 : ( $tmpl-> use_cache && $tmpl->cache_expire_type == 1 ) ? $tmpl->cache_expire_interval2399 : ( $tmpl-> use_cache && $tmpl->cache_expire_type == 2 ) ? 02398 : ( $tmpl->cache_expire_type == 1 ) ? $tmpl->cache_expire_interval 2399 : ( $tmpl->cache_expire_type == 2 ) ? 0 2400 2400 : 60 * 60; # default 60 min. 2401 2401 2402 if ( $tmpl->use_cache && $tmpl->cache_expire_type == 2) {2402 if ( $tmpl->cache_expire_type == 2 ) { 2403 2403 my @types = split /,/, ($tmpl->cache_expire_event || ''); 2404 2404 if (@types) { branches/release-36/lib/MT/Upgrade.pm
r2041 r2049 906 906 $map->file_template($file_template); 907 907 }, 908 }, 909 }, 910 'core_delete_template_meta_use_cache' => { 911 version_limit => 4.0059, 912 priority => 3.2, 913 updater => { 914 type => 'template', 915 label => 'Deleting use_cache record...', 916 sql => 'delete from mt_template_meta where template_meta_type="use_cache"', 908 917 }, 909 918 }, branches/release-36/php/lib/mtdb_base.php
r1986 r2049 39 39 'page_layout', 40 40 'include_with_ssi', 41 'use_cache',42 41 'cache_expire_type', 43 42 'cache_expire_interval',
