merge cleanup

diff --git a/htdocs/cgi-bin/main.cgi b/htdocs/cgi-bin/main.cgi
index 5569f1de4d3c086059ce175acc1d4c45b0aa25ec..d516d05041b56ef07fdd3eb438dc8610824376a0 100755 (executable)
--- a/htdocs/cgi-bin/main.cgi
+++ b/htdocs/cgi-bin/main.cgi
@@ -458,12 +458,12 @@ qq(\n<img src="$lnk" width="$imgw" height="$imgh" class="tag_FRM"/>);
         if ( $log =~ /<iframe / ) {
             my $a = q(<iframe width="560" height="315");
             my $b;
-            switch (&Setting::frameSize) {
+            switch (&Settings::frameSize) {
                 case "0" { $b = q(width="390" height="215") }
                 case "1" { $b = q(width="280" height="180") }
                 case "2" { $b = q(width="160" height="120") }
                 else {
-                    $b = &Setting::frameSize;
+                    $b = &Settings::frameSize;
                 }
             }
             $b = qq(<div><iframe align="center" $b);