Index: /branches/release-40/lib/MT/App.pm
===================================================================
--- /branches/release-40/lib/MT/App.pm (revision 2550)
+++ /branches/release-40/lib/MT/App.pm (revision 2644)
@@ -966,7 +966,7 @@
     my $blog_id = $blog->id if $blog;
 
-    my $c;
+    my ( $c, $commenter );
     if ( $blog_id && $blog ) {
-        my ( $sessobj, $commenter ) = $app->get_commenter_session();
+        ( my $sessobj, $commenter ) = $app->get_commenter_session();
         if ( $sessobj && $commenter ) {
             my $blog_perms = $commenter->blog_perm($blog_id);
@@ -1017,5 +1017,5 @@
     }
 
-    return $c;
+    return ( $c, $commenter );
 }
 
Index: /branches/release-40/lib/MT/Template/ContextHandlers.pm
===================================================================
--- /branches/release-40/lib/MT/Template/ContextHandlers.pm (revision 2640)
+++ /branches/release-40/lib/MT/Template/ContextHandlers.pm (revision 2644)
@@ -10997,5 +10997,5 @@
     return 'null' unless $app->can('session_state');
 
-    my $state = $app->session_state();
+    my ( $state, $commenter ) = $app->session_state();
     require JSON;
     my $json = JSON::objToJson($state);
Index: /branches/release-40/lib/MT/App/Comments.pm
===================================================================
--- /branches/release-40/lib/MT/App/Comments.pm (revision 2544)
+++ /branches/release-40/lib/MT/App/Comments.pm (revision 2644)
@@ -1404,5 +1404,5 @@
     return $app->error("Invalid request.") unless $jsonp;
 
-    my $state = $app->session_state;
+    my ( $state, $commenter ) = $app->session_state;
 
     require JSON;