[ljcom] r10881: LJSUP-8796: After adding comment the use...

U   trunk/bin/upgrading/en_LJ.dat
U   trunk/htdocs/identity/callback-facebook.bml
U   trunk/htdocs/identity/callback-google.bml
U   trunk/htdocs/identity/callback-mailru.bml
U   trunk/htdocs/identity/callback-twitter.bml
U   trunk/htdocs/identity/callback-vkontakte.bml

Modified: trunk/bin/upgrading/en_LJ.dat
===================================================================
--- trunk/bin/upgrading/en_LJ.dat	2011-08-17 10:40:09 UTC (rev 10880)
+++ trunk/bin/upgrading/en_LJ.dat	2011-08-18 02:31:48 UTC (rev 10881)
@@ -10531,3 +10531,8 @@
 mobile.image.placeholder=Image, click to view...
 
 comment.not.posted.POST.required.or.missing.parameter=Comment not posted: POST required, or missing parameter.
+talkpostdo.bml.error.unable.to.load.user.or.get.database.handle=Unable to load user or get database handle
+talkpostdo.bml.error.unable.to.load.pending.comment=Unable to load pending comment, maybe you took too long
+talkpostdo.bml.error.your.ip.address.is.detected.as.an.open.proxy=Your IP address ($remote_ip) is detected as an open proxy (a common source of spam) so comment access is denied.  If you do not believe you're accessing the net through an open proxy, please contact your ISP or this site's tech support to help resolve the problem.
+talkpostdo.bml.error.unknown.journal=Unknown journal. Please go back and try again.
+talkpostdo.bml.error.no.database.connection.present=No database connection present.  Please go back and try again.
\ No newline at end of file

Modified: trunk/htdocs/identity/callback-facebook.bml
===================================================================
--- trunk/htdocs/identity/callback-facebook.bml	2011-08-17 10:40:09 UTC (rev 10880)
+++ trunk/htdocs/identity/callback-facebook.bml	2011-08-18 02:31:48 UTC (rev 10881)
@@ -79,6 +79,9 @@
     # affects the partner sites authorization
     LJ::Session->allow_login_from_iframe;
 
+    # save current user id, so we can restore it later
+    $u->save_current();
+
     $u->make_login_session('long', 0);
     LJ::set_remote($u);
 

Modified: trunk/htdocs/identity/callback-google.bml
===================================================================
--- trunk/htdocs/identity/callback-google.bml	2011-08-17 10:40:09 UTC (rev 10880)
+++ trunk/htdocs/identity/callback-google.bml	2011-08-18 02:31:48 UTC (rev 10881)
@@ -70,6 +70,9 @@
     # affects the partner sites authorization
     LJ::Session->allow_login_from_iframe;
 
+    # save current user id, so we can restore it later
+    $u->save_current();
+
     $u->make_login_session('long', 0);
     LJ::set_remote($u);
 

Modified: trunk/htdocs/identity/callback-mailru.bml
===================================================================
--- trunk/htdocs/identity/callback-mailru.bml	2011-08-17 10:40:09 UTC (rev 10880)
+++ trunk/htdocs/identity/callback-mailru.bml	2011-08-18 02:31:48 UTC (rev 10881)
@@ -86,6 +86,9 @@
     # affects the partner sites authorization
     LJ::Session->allow_login_from_iframe;
 
+    # save current user id, so we can restore it later
+    $u->save_current();
+
     $u->make_login_session('long', 0);
     LJ::set_remote($u);
 

Modified: trunk/htdocs/identity/callback-twitter.bml
===================================================================
--- trunk/htdocs/identity/callback-twitter.bml	2011-08-17 10:40:09 UTC (rev 10880)
+++ trunk/htdocs/identity/callback-twitter.bml	2011-08-18 02:31:48 UTC (rev 10881)
@@ -57,7 +57,12 @@
     # affects the partner sites authorization
     LJ::Session->allow_login_from_iframe;
 
+    # save current user id, so we can restore it later
+    $u->save_current();
+
     $u->make_login_session('long', 0);
+
+    # extra action - already done in LJ::User::make_login_session
     LJ::set_remote($u);
 
     return LJ::Request->redirect($returl) unless $created;

Modified: trunk/htdocs/identity/callback-vkontakte.bml
===================================================================
--- trunk/htdocs/identity/callback-vkontakte.bml	2011-08-17 10:40:09 UTC (rev 10880)
+++ trunk/htdocs/identity/callback-vkontakte.bml	2011-08-18 02:31:48 UTC (rev 10881)
@@ -50,6 +50,9 @@
     # affects the partner sites authorization
     LJ::Session->allow_login_from_iframe;
 
+    # save current user id, so we can restore it later
+    $u->save_current();
+
     $u->make_login_session('long', 0);
     LJ::set_remote($u);