Changeset 16990 for branches/2.4/i.php


Ignore:
Timestamp:
Jul 24, 2012, 10:50:20 PM (12 years ago)
Author:
rvelices
Message:

bug 2682: Watermark sizing calculation is made on the requested size not on the final one (merge from trunk)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/2.4/i.php

    r16073 r16990  
    105105    header('Content-Location: '.$url);
    106106    header('Location: '.$url);
     107    ilog('WARN', $code, $url, $_SERVER['REQUEST_URI']);
    107108    exit;
    108109  }
     
    204205    preg_match($conf['sync_chars_regex'], $token) or ierror('Invalid chars in request', 400);
    205206  }
    206  
     207
    207208  $page['derivative_path'] = PHPWG_ROOT_PATH.PWG_DERIVATIVE_DIR.$req;
    208209
     
    453454  WHERE path=\''.$page['src_location'].'\'
    454455;';
    455    
     456
    456457    if ( ($row=pwg_db_fetch_assoc(pwg_query($query))) )
    457458    {
     
    465466      {
    466467        $page['rotation_angle'] = pwg_image::get_rotation_angle($page['src_path']);
    467        
     468
    468469        single_update(
    469470          $prefixeTable.'images',
     
    541542}
    542543
    543 if ($params->use_watermark)
     544if ($params->will_watermark($d_size))
    544545{
    545546  $wm = ImageStdParams::get_watermark();
Note: See TracChangeset for help on using the changeset viewer.