- Timestamp:
- Jul 24, 2012, 10:50:20 PM (12 years ago)
- Location:
- branches/2.4
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4/i.php
r16073 r16990 105 105 header('Content-Location: '.$url); 106 106 header('Location: '.$url); 107 ilog('WARN', $code, $url, $_SERVER['REQUEST_URI']); 107 108 exit; 108 109 } … … 204 205 preg_match($conf['sync_chars_regex'], $token) or ierror('Invalid chars in request', 400); 205 206 } 206 207 207 208 $page['derivative_path'] = PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$req; 208 209 … … 453 454 WHERE path=\''.$page['src_location'].'\' 454 455 ;'; 455 456 456 457 if ( ($row=pwg_db_fetch_assoc(pwg_query($query))) ) 457 458 { … … 465 466 { 466 467 $page['rotation_angle'] = pwg_image::get_rotation_angle($page['src_path']); 467 468 468 469 single_update( 469 470 $prefixeTable.'images', … … 541 542 } 542 543 543 if ($params-> use_watermark)544 if ($params->will_watermark($d_size)) 544 545 { 545 546 $wm = ImageStdParams::get_watermark(); -
branches/2.4/include/derivative.inc.php
r16507 r16990 198 198 if ( $src->has_size() && $params->is_identity( $src->get_size() ) ) 199 199 { 200 if (!$params-> use_watermark&& !$src->rotation)200 if (!$params->will_watermark($src->get_size()) && !$src->rotation) 201 201 { 202 202 $params = null; -
branches/2.4/include/derivative_params.inc.php
r14649 r16990 282 282 return true; 283 283 } 284 285 function will_watermark($out_size) 286 { 287 if ($this->use_watermark) 288 { 289 $min_size = ImageStdParams::get_watermark()->min_size; 290 return $min_size[0]<=$out_size[0] 291 && $min_size[1]<=$$out_size[1]; 292 } 293 return false; 294 } 284 295 } 285 296 ?>
Note: See TracChangeset
for help on using the changeset viewer.