GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

trim some output to avoid excessive whitespace

Browse Source 
darcs-hash:20081214161942-84dde-bfb91a534eb01d3e16b364937dcf405277e75a6a.gz
This commit is contained in:
Evan Prodromou 2008-12-14 11:19:42 -05:00
parent aa4fb6b71e
commit b6820b4f61
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/rssaction.php
View File

@ -123,7 +123,7 @@ class Rss10Action extends Action {
$nurl = common_local_url('shownotice', array('notice' => $notice->id)); $nurl = common_local_url('shownotice', array('notice' => $notice->id));
$creator_uri = common_profile_uri($profile); $creator_uri = common_profile_uri($profile);
common_element_start('item', array('rdf:about' => $notice->uri)); common_element_start('item', array('rdf:about' => $notice->uri));
$title = $profile->nickname . ': ' . common_xml_safe_str($notice->content); $title = $profile->nickname . ': ' . common_xml_safe_str(trim($notice->content));
common_element('title', NULL, $title); common_element('title', NULL, $title);
common_element('link', NULL, $nurl); common_element('link', NULL, $nurl);
common_element('description', NULL, $profile->nickname."'s status on ".common_exact_date($notice->created)); common_element('description', NULL, $profile->nickname."'s status on ".common_exact_date($notice->created));

10
lib/twitterapi.php
View File

@ -90,8 +90,10 @@ class TwitterapiAction extends Action {
$server = common_config('site', 'server'); $server = common_config('site', 'server');
$entry = array(); $entry = array();
$entry['content'] = common_xml_safe_str($notice->rendered); # We trim() to avoid extraneous whitespace in the output
$entry['title'] = $profile->nickname . ': ' . common_xml_safe_str($notice->content);
$entry['content'] = common_xml_safe_str(trim($notice->rendered));
$entry['title'] = $profile->nickname . ': ' . common_xml_safe_str(trim($notice->content));
$entry['link'] = common_local_url('shownotice', array('notice' => $notice->id)); $entry['link'] = common_local_url('shownotice', array('notice' => $notice->id));
$entry['published'] = common_date_iso8601($notice->created); $entry['published'] = common_date_iso8601($notice->created);
$entry['id'] = "tag:$server,2008:$entry[link]"; $entry['id'] = "tag:$server,2008:$entry[link]";
@ -113,7 +115,7 @@ class TwitterapiAction extends Action {
$entry['title'] = sprintf('Message from %s to %s', $entry['title'] = sprintf('Message from %s to %s',
$message->getFrom()->nickname, $message->getTo()->nickname); $message->getFrom()->nickname, $message->getTo()->nickname);
$entry['content'] = common_xml_safe_str($message->content); $entry['content'] = common_xml_safe_str(trim($message->content));
$entry['link'] = common_local_url('showmessage', array('message' => $message->id)); $entry['link'] = common_local_url('showmessage', array('message' => $message->id));
$entry['published'] = common_date_iso8601($message->created); $entry['published'] = common_date_iso8601($message->created);
$entry['id'] = "tag:$server,2008:$entry[link]"; $entry['id'] = "tag:$server,2008:$entry[link]";
@ -136,7 +138,7 @@ class TwitterapiAction extends Action {
$twitter_dm['id'] = $message->id; $twitter_dm['id'] = $message->id;
$twitter_dm['sender_id'] = $message->from_profile; $twitter_dm['sender_id'] = $message->from_profile;
$twitter_dm['text'] = $message->content; $twitter_dm['text'] = trim($message->content);
$twitter_dm['recipient_id'] = $message->to_profile; $twitter_dm['recipient_id'] = $message->to_profile;
$twitter_dm['created_at'] = $this->date_twitter($message->created); $twitter_dm['created_at'] = $this->date_twitter($message->created);
$twitter_dm['sender_screen_name'] = $from_profile->nickname; $twitter_dm['sender_screen_name'] = $from_profile->nickname;