Changeset 398385

Timestamp:

06/17/2011 02:48:43 PM (15 years ago)

Author:

0xTC

Message:

 

Location:

wp-tweet-button/trunk

Files:

• inc/settings.inc.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• wp-tweet-button.php (modified) (11 diffs)

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

@@ -471 +471 @@
                             <input type="checkbox" value="1" <?php if ($this->tw_get_option('tw_bwdata_attr') == '1') echo 'checked="checked"'; ?> name="tw_bwdata_attr" id="tw_bwdata_attr" />
                             <label for="tw_bwdata_attr"><?php _e('Build Tweet Button with HTML5 data attributes.',$this->txtdom); ?></label><br />
+                            <input type="checkbox" value="1" <?php if ($this->tw_get_option('tw_urlencode') == '1') echo 'checked="checked"'; ?> name="tw_urlencode" id="tw_urlencode" />
+                            <label for="tw_urlencode"><?php _e('Check this box if you experience character encoding issues.',$this->txtdom); ?></label><br />
                             <input type="checkbox" value="1" <?php if ($this->tw_get_option('tw_url_samecount') == '1') echo 'checked="checked"'; ?> name="tw_url_samecount" id="tw_url_samecount" />
                             <label for="tw_url_samecount"><?php _e('Display the same tweet count across all shorteners.',$this->txtdom); ?></label><br />

wp-tweet-button/trunk/readme.txt

@@ -130 +130 @@
 == Changelog ==
 
+= 2.1.1 =
+* Added option for blogs experiencing character encoding issues.
+
 = 2.1.0 =
 * Added option to exclude button blow posts in the archives (No After in Archives)
@@ -135 +138 @@
 * Added support for %POSTCONTENT% variable in tweet customizations
 * Added "Long Tweet Mode" (In case you don't want to use %POSTCONTENT% as your "Custom text"). This allows you to auto-tweet the first part of your content followed by a link that takes the reader to the entry on your site.
-* Links are included in all Autotweets by default. Options to decide action has been removed.
+* Links are included in all Autotweets by default. Option to select action has been removed.
 
 = 2.0.9 =

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

@@ -2 +2 @@
 /*
 Plugin Name: WP Tweet Button
-Version: 2.1.0
+Version: 2.1.1
 Plugin URI: http://0xtc.com/plugins/wp-tweet-button
 Description: The WordPress implementation of the official Twitter Tweet Button.
@@ -119 +119 @@
         'tw_auto_long_tweet_mode'=>'',
         'tw_script_infooter'=>'0',
+        'tw_urlencode'=>'0',
         'tw_prev_content_dup'=>'1'
         );
@@ -154 +155 @@
         'tw_no_https_shortlinks',
         'tw_prev_content_dup',
+        'tw_urlencode',
         'tw_nostyle_feed'
         );
@@ -335 +337 @@
             $activepost = $post;
         }
+
         return $activepost;
     }
@@ -474 +477 @@
     * This function decides the format of the tweet text based on preferences and limitations.
     */
-    function tw_get_text($entitydecode=false,$dots=true){
+    function tw_get_text($entitydecode=false,$dots=true){   
         $activepost = $this->tw_get_activepost();
         if (get_post_meta($activepost->ID, '_twitterrelated_custom_text', true)){
@@ -484 +487 @@
         } else {
             $tw_text = $this->tw_get_option('tw_text');
-            if ($tw_text=='entry_title') { $button_data_text = get_the_title($activepost->ID);}
-            if ($tw_text=='page_title') { $button_data_text = get_the_title($activepost->ID) .' - '. get_bloginfo('name');}
+            
+            if ($this->tw_get_option('tw_urlencode')=='1'){
+                if ($tw_text=='entry_title') { $button_data_text =$activepost->post_title;}
+                if ($tw_text=='page_title') { $button_data_text = $activepost->post_title .' - '. get_bloginfo('name');}
+            } else {
+                if ($tw_text=='entry_title') { $button_data_text = get_the_title($activepost->ID);}
+                if ($tw_text=='page_title') { $button_data_text = get_the_title($activepost->ID) .' - '. get_bloginfo('name');}
+            }
             if ($tw_text=='blog_title')  { $button_data_text = get_bloginfo('name');}
             if ($tw_text=='custom_title') { $button_data_text = $this->tw_preptext(stripslashes($this->tw_get_option('tw_text_custom')));}
@@ -527 +536 @@
         $tmptxt = null;
         $tmptxt= str_replace('%POSTCONTENT%', strip_tags($activepost->post_content), $text);
-        $tmptxt= str_replace('%POSTTITLE%', get_the_title($activepost->ID), $tmptxt);
+        if ($this->tw_get_option('tw_urlencode')=='1'){
+            $tmptxt= str_replace('%POSTTITLE%', $activepost->post_title, $tmptxt);
+        } else {
+            $tmptxt= str_replace('%POSTTITLE%', get_the_title($activepost->ID), $tmptxt);
+        }
         $tmptxt= str_replace('%BLOGTITLE%', get_bloginfo('name'), $tmptxt);
         $tmptxt= str_replace('%BLOGHASHTAGS%', $this->tw_get_hash_tags(), $tmptxt);
@@ -587 +600 @@
             }
 
-            add_action('profile_update',        array(&$this, 'tw_account_cleanup'));   
+            add_action('profile_update',        array(&$this, 'tw_account_cleanup'));
+            
+
+            
     }
     
@@ -878 +894 @@
 //          $button_data_status_id = 'data-status-id="'.$tid.'"';
         }
-        $button_data_text = 'data-text="'.$textprefix . htmlspecialchars($this->tw_get_text(null)).'"';
+        $thetext = htmlspecialchars($textprefix . $this->tw_get_text(null));
+        $button_data_text = 'data-text="'.$thetext.'"';
         $button_data_related = 'data-related="'.$this->tw_get_related_text().'"';
         $button_data_count = 'data-count="'.$this->tw_get_option('tw_count').'"';
@@ -912 +929 @@
             }
         }
-        $button .= '&text='.str_replace('+','%20',urlencode($textprefix . $this->tw_get_text(true)));
+        $thetext = urlencode($textprefix . $this->tw_get_text(true));
+        $button .= '&text='.str_replace(array('+',' '),'%20',$thetext);
         $button .= '&related='.$this->tw_get_related_text(true);
         $button .= '&lang='.$this->tw_get_option('tw_lang');
@@ -1543 +1561 @@
 /**
 * Class, exciting and new. Create one or even a few. Bugs, a coder's reward. Ruins flow and it comes back to you. Wordpress, soon will be making another run and Wordpress promises something for everyone....
-*/  
+*/
+
 $wpTweetButton = new wpTweetButton();
 load_plugin_textdomain($wpTweetButton->txtdom,null,dirname( plugin_basename( __FILE__ ) ).'/lang/');