Changeset 15299 for trunk/picture.php

Timestamp:

May 25, 2012, 1:12:04 AM (13 years ago)

Author:

plg

Message:

feature 2633 added: ability to select default size

File:

• trunk/picture.php (modified) (3 diffs)

trunk/picture.php

@@ -150 +150 @@
 function default_picture_content($content, $element_info)
 {
+  global $conf;
+  
   if ( !empty($content) )
   {// someone hooked us - so we skip;
@@ -163 +165 @@
     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];
 
@@ -939 +941 @@
     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_CANONICAL', make_picture_url( array('image_id'=>$picture['current']['id'], 'image_file'=>$picture['current']['file']) ) );
+  $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'])
+    )
+  );
 
 // +-----------------------------------------------------------------------+