summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@controlyourself.ca>2009-08-11 10:23:11 -0400
committerEvan Prodromou <evan@controlyourself.ca>2009-08-11 10:23:11 -0400
commit2d29800b6f2f5e7581241dfa3e0a19fc5925049c (patch)
tree61de1af08d79716d59bfcdd1e8cf153a123d922a
parent73cde378c9f8d14cb2c4a896813ac6d21299a142 (diff)
parentaa9fcb91846135014eaeb2c14d4069e60b56d65f (diff)
Merge branch 'master' into 0.8.x
Conflicts: lib/mail.php lib/rssaction.php lib/twitterapi.php
-rw-r--r--lib/mail.php4
-rw-r--r--lib/twitterapi.php24
2 files changed, 14 insertions, 14 deletions
diff --git a/lib/mail.php b/lib/mail.php
index 33d1eb754..2e471fd6d 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -692,11 +692,11 @@ function mail_facebook_app_removed($user)
$site_name = common_config('site', 'name');
$subject = sprintf(
- _('Your %1$s Facebook application access has been disabled.',
+ _('Your %1\$s Facebook application access has been disabled.',
$site_name));
$body = sprintf(_("Hi, %1\$s. We're sorry to inform you that we are " .
- 'unable to update your Facebook status from %2$s, and have disabled ' .
+ 'unable to update your Facebook status from %2\$s, and have disabled ' .
'the Facebook application for your account. This may be because ' .
'you have removed the Facebook application\'s authorization, or ' .
'have deleted your Facebook account. You can re-enable the ' .
diff --git a/lib/twitterapi.php b/lib/twitterapi.php
index a5dc2067f..583007208 100644
--- a/lib/twitterapi.php
+++ b/lib/twitterapi.php
@@ -188,20 +188,20 @@ class TwitterapiAction extends Action
// Enclosures
$attachments = $notice->attachments();
- $enclosures = array();
- foreach ($attachments as $attachment) {
- if ($attachment->isEnclosure()) {
- $enclosure = array();
- $enclosure['url'] = $attachment->url;
- $enclosure['mimetype'] = $attachment->mimetype;
- $enclosure['size'] = $attachment->size;
- $enclosures[] = $enclosure;
- }
- }
+ if (!empty($attachments)) {
- if (!empty($enclosures)) {
- $twitter_status['attachments'] = $enclosures;
+ $twitter_status['attachments'] = array();
+
+ foreach ($attachments as $attachment) {
+ if ($attachment->isEnclosure()) {
+ $enclosure = array();
+ $enclosure['url'] = $attachment->url;
+ $enclosure['mimetype'] = $attachment->mimetype;
+ $enclosure['size'] = $attachment->size;
+ $twitter_status['attachments'][] = $enclosure;
+ }
+ }
}
if ($include_user) {