[ljcom] r9926: LJSUP-7714: "/customize/options.bml" pag...

LJSUP-7714: "/customize/options.bml" page changed (NavStripChooser)

U   trunk/cgi-bin/LJ/Hooks/ControlStrip.pm

Modified: trunk/cgi-bin/LJ/Hooks/ControlStrip.pm
===================================================================
--- trunk/cgi-bin/LJ/Hooks/ControlStrip.pm	2011-01-20 03:47:53 UTC (rev 9925)
+++ trunk/cgi-bin/LJ/Hooks/ControlStrip.pm	2011-01-20 05:00:15 UTC (rev 9926)
@@ -67,6 +67,8 @@
     }
 });
 
+if ($LJ::DISABLED{control_strip_new})
+{
 LJ::register_hook('show_control_strip', sub {
     my $opts = shift;
 
@@ -100,7 +102,22 @@
     return 1 if $remote && $remote->prop('view_control_strip');
     return undef;
 });
+} else {
+LJ::register_hook('show_control_strip', sub {
+    my $opts = shift;
 
+    return undef unless $LJ::USE_CONTROL_STRIP;
+    return undef if $LJ::DISABLED{'control_strip'};
+
+    my $remote = LJ::get_remote();
+
+    return 1 unless $remote;
+    return 1 if $remote->prop('show_control_strip');
+
+    return undef;
+});
+}
+
 # this will need_res required controlstrip css
 # does not return anything
 LJ::register_hook('control_strip_stylesheet_link', sub {