summaryrefslogtreecommitdiff
path: root/plugins/Facebook
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-05-25 12:31:16 -0700
committerBrion Vibber <brion@pobox.com>2010-05-25 12:31:16 -0700
commit3d4ce6f10b94d487e8eff89f689fba22327634f0 (patch)
tree42db8c7f70ef61148cfdf92c173cad39d206198e /plugins/Facebook
parentf98609204fb9b5966b9e4c9e4bf8bf605656c31c (diff)
Revert "Backing out locale switch change to see if this affects our mystery memory leak."
This reverts commit f98609204fb9b5966b9e4c9e4bf8bf605656c31c.
Diffstat (limited to 'plugins/Facebook')
-rw-r--r--plugins/Facebook/facebookutil.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/Facebook/facebookutil.php b/plugins/Facebook/facebookutil.php
index 9c35276b7..c7b0f02c3 100644
--- a/plugins/Facebook/facebookutil.php
+++ b/plugins/Facebook/facebookutil.php
@@ -461,12 +461,12 @@ function remove_facebook_app($flink)
function mail_facebook_app_removed($user)
{
- common_init_locale($user->language);
-
$profile = $user->getProfile();
$site_name = common_config('site', 'name');
+ common_switch_locale($user->language);
+
$subject = sprintf(
_m('Your %1$s Facebook application access has been disabled.',
$site_name));
@@ -480,7 +480,7 @@ function mail_facebook_app_removed($user)
"re-installing the %2\$s Facebook application.\n\nRegards,\n\n%2\$s"),
$user->nickname, $site_name);
- common_init_locale();
+ common_switch_locale();
return mail_to_user($user, $subject, $body);
}