Changeset 355924

Timestamp:

03/05/2011 09:05:22 PM (15 years ago)

Author:

0xTC

Message:

 

Location:

wp-tweet-button/trunk

Files:

• readme.txt (modified) (2 diffs)
• wp-tweet-button.php (modified) (8 diffs)

wp-tweet-button/trunk/readme.txt

@@ -2 +2 @@
 Contributors: 0xTC
 Tags: twitter, tweet button, retweet, tweet, autotweet, WP Tweet Button, advanced, tweeting, social media, button, SEO, share, shortener, awe.sm, b2l.me, bit.ly, cli.gs, sl.ly, snipr, su.pr, tinyurl, analytics, google analytics, campaign, campaign tracking, auto tweeting, auto posts
-Requires at least: 2.7.2
+Requires at least: 2.8
 Tested up to: 3.1
 Stable tag: trunk
@@ -125 +125 @@
 == Changelog ==
 
+= 2.0.5 =
+* Bugfix related to shortlinks and links on main page.
+
 = 2.0.4.3 =
 * Improved shortlink handling in Wordpress 3.1. Shortlink settings in this plugin can be set as universal by checking the "Add rel=shortlink to head" box.

wp-tweet-button/trunk/wp-tweet-button.php

@@ -2 +2 @@
 /*
 Plugin Name: WP Tweet Button
-Version: 2.0.4.3
+Version: 2.0.5
 Plugin URI: http://0xtc.com/plugins/wp-tweet-button
 Description: The WordPress implementation of the official Twitter Tweet Button.
@@ -488 +488 @@
     */
     function tw_add_rel_shortlink(){
-        echo '<link rel="shortlink" href="'.$this->tw_get_short_url().'" />';
+        if (is_home()){
+            $url =  home_url();
+        } else {
+            $url = $this->tw_get_short_url();
+        }
+        echo '<link rel="shortlink" href="'.$url.'" />';
     }
     
@@ -589 +594 @@
                 remove_action(  'wp_head',                  'wp_shortlink_wp_head', 10, 0 );
                 add_action(     'wp_head', array(&$this,    'tw_add_rel_shortlink'));
-                if ($this->tw_get_option('tw_url_shortener') != 'wordpress') add_filter('pre_get_shortlink', array(&$this, 'tw_get_short_url'),3);
+                if (($this->tw_get_option('tw_url_shortener') != 'wordpress')){
+                    
+                    add_filter('pre_get_shortlink', array(&$this, 'tw_get_short_url'),3);
+
+                    }
             }
         }
@@ -870 +879 @@
     function tw_get_long_url($addtrack=false, $addlang=true) {
         global $my_transposh_plugin;
-    
+        
+        if (!in_the_loop() && is_home()){return esc_url(home_url());}
+        
         if(is_int($this->postid)) {
             $post = get_post($this->postid);
@@ -878 +889 @@
         $perms=null;
         if (empty($post->post_title)) {
-            $perms= 'http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
+            $perms= esc_url('http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
         } else {
             $perms = trim(get_permalink($post->ID));
@@ -925 +936 @@
             global $post;
         }
+        
+        if (!in_the_loop() && is_home()){return esc_url(home_url());}
+        
         $perms = $this->tw_get_long_url(true);
         if ($perms == false) return false;
@@ -1134 +1148 @@
     function tweetbutton($post,$bwdata=false) {
         global $post;
-        $post = get_post($this->postid);
+//      $thepost = get_post($this->postid);
         $this->postid = $post->ID;
         if (isset($post->ID)){
@@ -2041 +2055 @@
         $wpTweetButton->tw_set_option('tw_count', $type);
     }
-    return $wpTweetButton->tweetbutton($post,$bwdata);
+    return $wpTweetButton->tweetbutton($thepost,$bwdata);
 }