Changeset 23201 for extensions/SocialButtons/include

Timestamp:

Jun 14, 2013, 12:43:50 PM (11 years ago)

Author:

mistic100

Message:

remove "no caption" option for facebook (buggy)
fix urls
fix pinterest javascript

Location:

extensions/SocialButtons/include

Files:

• facebook.inc.php (modified) (1 diff)
• google.inc.php (modified) (1 diff)
• install.inc.php (modified) (1 diff)
• pinterest.inc.php (modified) (1 diff)
• tumblr.inc.php (modified) (1 diff)

extensions/SocialButtons/include/facebook.inc.php

@@ -18 +18 @@
   
   // if the link is in the toolbar, we must use smaller buttons
-  if ( $conf['SocialButtons']['position'] == 'index' or  $conf['SocialButtons']['position'] == 'toolbar')
+  if ($conf['SocialButtons']['position'] == 'index' or $conf['SocialButtons']['position'] == 'toolbar')
   {
     if ($conf['SocialButtons']['facebook']['layout'] == 'box_count')

extensions/SocialButtons/include/google.inc.php

@@ -15 +15 @@
   
   // if the link is in the toolbar, we must use smaller buttons
-  if ( $conf['SocialButtons']['position'] == 'index' or  $conf['SocialButtons']['position'] == 'toolbar')
+  if ($conf['SocialButtons']['position'] == 'index' or $conf['SocialButtons']['position'] == 'toolbar')
   {
     if ($conf['SocialButtons']['google']['size'] == 'tall' and $conf['SocialButtons']['google']['annotation'] == 'bubble')

extensions/SocialButtons/include/install.inc.php

@@ -79 +79 @@
     }
     
+    if ($new_conf['facebook']['layout'] == 'none')
+    {
+      $new_conf['facebook']['layout'] = 'button_count';
+    }
+    
     $conf['SocialButtons'] = serialize($new_conf);
     conf_update_param('SocialButtons', $conf['SocialButtons']);

extensions/SocialButtons/include/pinterest.inc.php

@@ -18 +18 @@
   if ($conf['SocialButtons']['pinterest']['img_size'] == 'Original')
   {
-    $tpl_vars['PINTEREST']['source'] = $root_url.ltrim($picture['current']['src_image']->get_url(), './');
+    $tpl_vars['PINTEREST']['source'] = $picture['current']['src_image']->get_url();
   }
   else
   {
-    $tpl_vars['PINTEREST']['source'] = $root_url.ltrim(DerivativeImage::url($conf['SocialButtons']['pinterest']['img_size'], $picture['current']['src_image']), './');
+    $tpl_vars['PINTEREST']['source'] = DerivativeImage::url($conf['SocialButtons']['pinterest']['img_size'], $picture['current']['src_image']);
   }
   

extensions/SocialButtons/include/tumblr.inc.php

@@ -19 +19 @@
     if ($conf['SocialButtons']['tumblr']['img_size'] == 'Original')
     {
-      $tpl_vars['TUMBLR']['source'] = $root_url.ltrim($picture['current']['src_image']->get_url(), './');
+      $tpl_vars['TUMBLR']['source'] = $picture['current']['src_image']->get_url();
     }
     else
     {
-      $tpl_vars['TUMBLR']['source'] = $root_url.ltrim(DerivativeImage::url($conf['SocialButtons']['tumblr']['img_size'], $picture['current']['src_image']), './');
+      $tpl_vars['TUMBLR']['source'] = DerivativeImage::url($conf['SocialButtons']['tumblr']['img_size'], $picture['current']['src_image']);
     }
   }