[livejournal] r22649: LJSUP-13267: Some improvements for prope...

LJSUP-13267: Some improvements for properties of S2-layers

U   trunk/cgi-bin/LJ/Customize.pm
U   trunk/cgi-bin/LJ/Widget/S2PropGroup.pm

Modified: trunk/cgi-bin/LJ/Customize.pm
===================================================================
--- trunk/cgi-bin/LJ/Customize.pm	2012-08-15 08:18:46 UTC (rev 22648)
+++ trunk/cgi-bin/LJ/Customize.pm	2012-08-15 08:46:17 UTC (rev 22649)
@@ -544,7 +544,9 @@
             $prop = S2::get_property($lyr_core->{'s2lid'}, $prop);
             next unless ref $prop;
         }
-       
+
+        next if (S2::is_property_hidden([$style->{'layer'}{'theme'}], $prop->{'name'}));
+
         if (LJ::is_enabled("delayed_entries")) { 
             if ($prop->{'name'} eq 'sticky_subject' ||
                 $prop->{'name'} eq 'sticky_post' ) {

Modified: trunk/cgi-bin/LJ/Widget/S2PropGroup.pm
===================================================================
--- trunk/cgi-bin/LJ/Widget/S2PropGroup.pm	2012-08-15 08:18:46 UTC (rev 22648)
+++ trunk/cgi-bin/LJ/Widget/S2PropGroup.pm	2012-08-15 08:46:17 UTC (rev 22649)
@@ -172,12 +172,13 @@
 
     my $props_to_skip = $opts{props_to_skip};
     my $theme = $opts{theme};
+    my $style = $opts{style};
 
     if (!$prop) {
         return 1 unless $prop_name eq "linklist_support" && $theme && $theme->linklist_support_tab;
     }
 
-    return 1 if $prop->{noui};
+    return 1 if $prop->{noui} && !S2::is_property_use ([$style->{'layer'}{'theme'}], $prop->{'name'});
 
     return 1 if $props_to_skip && $props_to_skip->{$prop_name};