[ljcom] r10454: LJSUP-8445: S2 160x600

U   trunk/bin/upgrading/s2layers/nebula/layout.s2
U   trunk/bin/upgrading/s2layers/opal/layout.s2

Modified: trunk/bin/upgrading/s2layers/nebula/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/nebula/layout.s2	2011-04-27 09:55:44 UTC (rev 10453)
+++ trunk/bin/upgrading/s2layers/nebula/layout.s2	2011-04-27 10:00:16 UTC (rev 10454)
@@ -1186,7 +1186,7 @@
         "          </ul>\n        </div>\n";
     }
     print linklist();
-    if (viewer_sees_ad_box("s2.vertical.2")) {
+    if (viewer_sees_vbox() and viewer_sees_ad_box("s2.vertical.2")) {
         """<div class="sideBarBox"><div class="box-vertical2">""";
         $p->print_ad_box("s2.vertical.2");
         """</div></div>""";

Modified: trunk/bin/upgrading/s2layers/opal/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/opal/layout.s2	2011-04-27 09:55:44 UTC (rev 10453)
+++ trunk/bin/upgrading/s2layers/opal/layout.s2	2011-04-27 10:00:16 UTC (rev 10454)
@@ -1772,7 +1772,7 @@
 
     $this->lay_print_sidebar();
 
-    if (viewer_sees_ad_box("s2.vertical.2")) {
+    if (viewer_sees_vbox() and viewer_sees_ad_box("s2.vertical.2")) {
         """<div class="box-vertical2">""";
         $this->print_ad_box("s2.vertical.2");
         """</div>""";