diff options
Diffstat (limited to 'lib/VNWeb')
| -rw-r--r-- | lib/VNWeb/HTML.pm | 5 | ||||
| -rw-r--r-- | lib/VNWeb/Misc/History.pm | 2 | ||||
| -rw-r--r-- | lib/VNWeb/User/Page.pm | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/lib/VNWeb/HTML.pm b/lib/VNWeb/HTML.pm index 17ab0947..ad5a9076 100644 --- a/lib/VNWeb/HTML.pm +++ b/lib/VNWeb/HTML.pm @@ -119,9 +119,10 @@ sub _head_ { my $o = shift; my $fancy = !(auth->pref('nodistract_can') && auth->pref('nodistract_nofancy')); - my $skin = tuwf->reqGet('skin') || ($fancy && $o->{pubskin}{pubskin_can} ? $o->{pubskin}{skin} : auth->pref('skin')) || ''; + my $pubskin = $fancy && $o->{pubskin}{pubskin_can} && $o->{pubskin}{pubskin_enabled}; + my $skin = tuwf->reqGet('skin') || ($pubskin ? $o->{pubskin}{skin} : auth->pref('skin')) || ''; $skin = config->{skin_default} if !tuwf->{skins}{$skin}; - my $customcss = $fancy && $o->{pubskin}{pubskin_can} ? $o->{pubskin}{customcss} : auth->pref('customcss'); + my $customcss = $pubskin ? $o->{pubskin}{customcss} : auth->pref('customcss'); meta_ charset => 'utf-8'; title_ $o->{title}.' | vndb'; diff --git a/lib/VNWeb/Misc/History.pm b/lib/VNWeb/Misc/History.pm index 2ba4675d..5251d4ea 100644 --- a/lib/VNWeb/Misc/History.pm +++ b/lib/VNWeb/Misc/History.pm @@ -187,7 +187,7 @@ TUWF::get qr{/(?:([upvrcsd])([1-9]\d*)/)?hist} => sub { }; my $obj = !$type ? undef : - $type eq 'u' ? tuwf->dbRowi('SELECT id, ', sql_user(), ', pubskin_can, customcss, skin FROM users u WHERE id =', \$id) : + $type eq 'u' ? tuwf->dbRowi('SELECT id, ', sql_user(), ', pubskin_can, pubskin_enabled, customcss, skin FROM users u WHERE id =', \$id) : $type eq 'p' ? dbitem producers => 'name' : $type eq 'v' ? dbitem vn => 'title' : $type eq 'r' ? dbitem releases => 'title' : diff --git a/lib/VNWeb/User/Page.pm b/lib/VNWeb/User/Page.pm index b276f8fa..1eebcbb0 100644 --- a/lib/VNWeb/User/Page.pm +++ b/lib/VNWeb/User/Page.pm @@ -125,7 +125,7 @@ sub _votestats_ { TUWF::get qr{/$RE{uid}}, sub { my $u = tuwf->dbRowi(q{ - SELECT id, hide_list, c_changes, c_votes, c_tags, pubskin_can, skin, customcss + SELECT id, hide_list, c_changes, c_votes, c_tags, pubskin_can, pubskin_enabled, skin, customcss ,}, sql_totime('registered'), q{ AS registered ,}, sql_user(), q{ FROM users u |