archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature 2633 added: ability to select default size

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@15299 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall 2012-05-24 23:12:04 +00:00
parent dcd6efb7fc
commit b205058983
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/config_default.inc.php
View file

@ -760,4 +760,7 @@ $conf['upload_form_automatic_rotation'] = true;
$conf['derivative_url_style']=0;
$conf['chmod_value']= substr_compare(PHP_SAPI, 'apa', 0, 3)==0 ? 0777 : 0755;
// 'small', 'medium' or 'large'
$conf['derivative_default_size'] = 'medium';
?>

18
picture.php
View file

@ -149,6 +149,8 @@ trigger_action('loc_begin_picture');
// this is the default handler that generates the display for the element
function default_picture_content($content, $element_info)
{
global $conf;
if ( !empty($content) )
{// someone hooked us - so we skip;
return $content;
@ -162,7 +164,7 @@ function default_picture_content($content, $element_info)
}
setcookie('picture_deriv', false, 0, cookie_path() );
}
$deriv_type = pwg_get_session_var('picture_deriv', IMG_LARGE);
$deriv_type = pwg_get_session_var('picture_deriv', $conf['derivative_default_size']);
$selected_derivative = $element_info['derivatives'][$deriv_type];
$unique_derivatives = array();
@ -938,10 +940,20 @@ if (isset($picture['next'])
and $picture['next']['src_image']->is_original()
and strpos($_SERVER['HTTP_USER_AGENT'], 'Chrome/') === false)
{
$template->assign('U_PREFETCH', $picture['next']['derivatives'][pwg_get_session_var('picture_deriv', IMG_LARGE)]->get_url() );
$template->assign(
'U_PREFETCH',
$picture['next']['derivatives'][pwg_get_session_var('picture_deriv', $conf['derivative_default_size'])]->get_url()
);
}
$template->assign('U_CANONICAL', make_picture_url( array('image_id'=>$picture['current']['id'], 'image_file'=>$picture['current']['file']) ) );
$template->assign(
'U_CANONICAL',
make_picture_url(
array(
'image_id' => $picture['current']['id'],
'image_file' => $picture['current']['file'])
)
);
// +-----------------------------------------------------------------------+
// | sub pages |