Backing out locale switch change to see if this affects our mystery memory leak.
Revert "Locale switch cleanup: use common_switch_locale() which is safer for updating gettext state. Also moved a few calls to reduce chance of hitting an exception before switching back."
This reverts commit 74a89b1fc3
.
This commit is contained in:
@@ -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_switch_locale();
|
||||
common_init_locale();
|
||||
return mail_to_user($user, $subject, $body);
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user