Changeset 12958


Ignore:
Timestamp:
Jan 26, 2012, 10:15:16 PM (8 years ago)
Author:
rvelices
Message:

feature 2548 multisize - small fixes

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/i.php

    r12920 r12958  
    7474      return;
    7575  }
    76   fwrite($ilogfh, date("c") );
     76  $line = date("c");
    7777  foreach( func_get_args() as $arg)
    7878  {
    79     fwrite($ilogfh, ' ' );
     79    $line .= ' ';
    8080    if (is_array($arg))
    8181    {
    82       fwrite($ilogfh, implode(' ', $arg) );
     82      $line .= implode(' ', $arg);
    8383    }
    8484    else
    8585    {
    86       fwrite($ilogfh, $arg);
    87     }
    88   }
    89   fwrite($ilogfh, "\n");
     86      $line .= $arg;
     87    }
     88  }
     89  fwrite($ilogfh, $line."\n");
    9090}
    9191
     
    397397}
    398398
     399if ($d_size[0]*$d_size[1] < 100000)
     400{// strip metadata for small images
     401  $image->strip();
     402}
    399403$image->set_compression_quality( $params->quality );
    400404$image->write( $page['derivative_path'] );
  • trunk/picture.php

    r12920 r12958  
    157157  if (isset($_COOKIE['picture_deriv']))
    158158  {
    159     pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']);
    160     setcookie('picture_deriv', false, 0);
     159    if ( array_key_exists($_COOKIE['picture_deriv'], ImageStdParams::get_defined_type_map()) )
     160    {
     161      pwg_set_session_var('picture_deriv', $_COOKIE['picture_deriv']);
     162    }
     163    setcookie('picture_deriv', false, 0, cookie_path() );
    161164  }
    162165  $deriv_type = pwg_get_session_var('picture_deriv', IMG_LARGE);
     
    195198  $template->assign( array(
    196199      'ALT_IMG' => $element_info['file'],
     200      'COOKIE_PATH' => cookie_path(),
    197201      )
    198202    );
  • trunk/themes/default/template/picture_content.tpl

    r12880 r12958  
    1616                theImg.useMap = "#map"+typeMap;
    1717        }
    18         document.cookie = 'picture_deriv=' + typeSave;
     18        document.cookie = 'picture_deriv='+typeSave+';path={/literal}{$COOKIE_PATH}{literal}';
    1919}
    2020
  • trunk/themes/default/template/thumbnails.tpl

    r12954 r12958  
    66.thumbnails .wrap2 A,
    77.thumbnails LABEL{ldelim}
    8         width: {$derivative_params->max_width()}px;
     8        width: {$derivative_params->max_width()+2}px;
    99}
    1010
    1111.thumbnails .wrap2{ldelim}
    12         height: {$derivative_params->max_height()+2}px;
     12        height: {$derivative_params->max_height()+3}px;
    1313}
    1414{if $derivative_params->max_width() > 600}
Note: See TracChangeset for help on using the changeset viewer.