Changeset 19394 for extensions/TumblrShare/main.inc.php

Timestamp:

Dec 11, 2012, 4:54:12 PM (11 years ago)

Author:

mistic100

Message:

allow to choose shared size, compatible with 'question_mark_in_url'=false

File:

• extensions/TumblrShare/main.inc.php (modified) (2 diffs)

extensions/TumblrShare/main.inc.php

@@ -39 +39 @@
   if (script_basename() == 'picture')
   {
-    $current_picture = $template->get_template_vars('current');
+    global $picture;
     
     $template->assign(array(
       'TUMBLR_MODE' => 'photo',
-      'TUMBLR_URL' => $root_url.duplicate_picture_url(),
-      'TUMBLR_TITLE' => $current_picture['TITLE'],
+      'TUMBLR_URL' => $root_url.ltrim(duplicate_picture_url(), './'),
+      'TUMBLR_TITLE' => $picture['current']['TITLE'],
       ));
     
-    if (!empty($current_picture['selected_derivative']))
+    if ($conf['TumblrShare']['img_size'] == 'Original')
     {
-      $template->assign('TUMBLR_SOURCE', $root_url.$current_picture['selected_derivative']->get_url());
+      $template->assign('TUMBLR_SOURCE', $root_url.ltrim($picture['current']['src_image']->get_url(), './'));
     }
     else
     {
-      $template->assign('TUMBLR_SOURCE', $root_url.ltrim($current_picture['src_image']->rel_path, './'));
+      $template->assign('TUMBLR_SOURCE', $root_url.ltrim(DerivativeImage::url($conf['TumblrShare']['img_size'], $picture['current']['src_image']), './'));
     }
   }
@@ -62 +62 @@
     $template->assign(array(
       'TUMBLR_MODE' => 'link',
-      'TUMBLR_URL' => $root_url.duplicate_index_url(),
+      'TUMBLR_URL' => $root_url.ltrim(duplicate_index_url(), './'),
       'TUMBLR_TITLE' => strip_tags($page['title']),
       ));