Merge lp:~edb/quam-plures/twitter_plugin_v2 into lp:quam-plures

[EdB]

[Yabs (yabs)]

easy one

¥

review: Approve

[lp:~edb/quam-plures/twitter_plugin_v2]

7603. By EdB on 2011-06-24

adding dracones branch

7604. By EdB on 2011-06-25

clean up posting and validating XHTML

[EdB (edb)]

bump?

[Tilman Blumenbach (tblue)]

Looks fine.

review: Approve

=== modified file 'qp_plugins/twitter_plugin/README.html'
--- qp_plugins/twitter_plugin/README.html	2010-12-20 18:06:43 +0000
+++ qp_plugins/twitter_plugin/README.html	2011-06-25 14:51:05 +0000
@@ -47,7 +47,7 @@
 <dt>User Settings:</dt>
 <dd><ul>
 <li><span class="settings">Twitter account status</span>: IF the user has not connected to their twitter account they will see a button to connect, else they will see the twitter account they are connected to.</li>
-<li><span class="settings">Message format</span>: This is the message that will be tweeted when posting.  Each user can put plain text in here, or you can use some codes to make a fancy tweet.  <strong>$twitcerpt$</strong> (default) provides an excerpt and link that totals 140 characters.  <strong>$title$</strong> provides the post title, <strong>$excerpt$</strong> provides the same excerpt that might be used in feeds and appears under your post in edit mode, and <strong>$url$</strong> provides a permalink to the posted item.</li>
+<li><span class="settings">Message format</span>: This is the message that will be tweeted when posting.  Each user can put plain text in here, or you can use some codes to make a fancy tweet.  <strong>$twitcerpt$</strong> (default) provides an excerpt (or title if there is no content excerpt) and link that totals 140 characters.  <strong>$title$</strong> provides the post title, <strong>$excerpt$</strong> provides the same excerpt that might be used in feeds and appears under your post in edit mode, and <strong>$url$</strong> provides a permalink to the posted item.</li>
 </ul></dd>
 <dt>Blog Settings:</dt>
 <dd><ul>
@@ -87,6 +87,7 @@
 <h2>Release History:</h2>
 <div id="log">
 <dl>
+<dt>0.2</dt><dd>use title if no excerpt for $twitcerpt$ (18-Jun-11)</dd>
 <dt>0.1</dt><dd>initial release (1-Jan-11)</dd>
 </dl>
 </div>

=== modified file 'qp_plugins/twitter_plugin/_twitter.plugin.php'
--- qp_plugins/twitter_plugin/_twitter.plugin.php	2010-12-31 12:12:03 +0000
+++ qp_plugins/twitter_plugin/_twitter.plugin.php	2011-06-25 14:51:05 +0000
@@ -441,7 +441,14 @@
 		$url = $params['Item']->get_permanent_url();
 		$short_url = $params['Item']->Blog->gen_blogurl().'?p='.$params['Item']->ID;
 		$clip_to = 140 - ( evo_strlen( $short_url ) + 4 );
-		$twitcerpt = trim( evo_substr( $excerpt, 0, $clip_to ) ).'... '.$short_url;
+		if( $excerpt != '' )
+		{ // if we have an excerpt then use it
+			$twitcerpt = trim( evo_substr( $excerpt, 0, $clip_to ) ).'... '.$short_url;
+		}
+		else
+		{ // no excerpt? use the title
+			$twitcerpt = trim( evo_substr( $title, 0, $clip_to ) ).'... '.$short_url;
+		}
 
 		$msg = str_replace( '$title$', $title, $msg );
 		$msg = str_replace( '$excerpt$', $excerpt, $msg );