[livejournal] r23458: LJSUP-14560: Ignore property "profile_ve...

[holyandrew]

Committer: akanashinLJSUP-14560: Ignore property "profile_ver_noswitch" for all users

U trunk/cgi-bin/LJ/User.pm
U trunk/cgi-bin/LJ/Widget/CreateAccount.pm
U trunk/htdocs/userinfo.bml

Modified: trunk/cgi-bin/LJ/User.pm
===================================================================
--- trunk/cgi-bin/LJ/User.pm 2012-12-12 08:24:56 UTC (rev 23457)
+++ trunk/cgi-bin/LJ/User.pm 2012-12-12 08:52:36 UTC (rev 23458)
@@ -2104,7 +2104,7 @@

my $url;
if ($u->{journaltype} eq "I") {
- if ($LJ::DISABLED{profile_controller} || ($remote && $remote->prop('profile_ver') eq "1" && !$remote->prop('profile_ver_noswitch'))) {
+ if ($LJ::DISABLED{profile_controller} || ($remote && $remote->prop('profile_ver') eq "1" )) {
$url = "$LJ::SITEROOT/userinfo.bml?userid=$u->{'userid'}&t=I";
$url .= "&mode=full" if $opts{full};
} else {

Modified: trunk/cgi-bin/LJ/Widget/CreateAccount.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/CreateAccount.pm 2012-12-12 08:24:56 UTC (rev 23457)
+++ trunk/cgi-bin/LJ/Widget/CreateAccount.pm 2012-12-12 08:52:36 UTC (rev 23458)
@@ -629,7 +629,6 @@
$nu->make_login_session;

$nu->set_prop("profile_ver", 2);
- $nu->set_prop("profile_ver_noswitch", 1);

# Default new accounts to Plus level
$nu->add_to_class('plus');

Modified: trunk/htdocs/userinfo.bml
===================================================================
--- trunk/htdocs/userinfo.bml 2012-12-12 08:24:56 UTC (rev 23457)
+++ trunk/htdocs/userinfo.bml 2012-12-12 08:52:36 UTC (rev 23458)
@@ -354,7 +354,7 @@

my $url = LJ::Request->uri();
# Page version switcher
- if (LJ::is_enabled('profile_controller') && $remote && !$remote->prop('profile_ver_noswitch')) {
+ if (LJ::is_enabled('profile_controller') && $remote) {
$body .= "";
if (LJ::did_post() && LJ::Request->post_param('new_version')) {
$remote->set_prop('profile_ver', 2);