Revert "Backing out locale switch change to see if this affects our mystery memory leak."

This reverts commit f98609204f.
This commit is contained in:
Brion Vibber
2010-05-25 12:31:16 -07:00
parent f98609204f
commit 3d4ce6f10b
4 changed files with 33 additions and 16 deletions

View File

@@ -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);
}