Changeset 14337

Timestamp:

2007-08-08T12:15:03+12:00 (17 years ago)

Author:

anna

Message:

Fixed a bug in extracting search box.

File:

• gsdl/trunk/perllib/plugins/MediaWikiPlug.pm (modified) (2 diffs)

gsdl/trunk/perllib/plugins/MediaWikiPlug.pm

@@ -375 +375 @@
     } else {
         $preserve_sections .= "\n$searchbox_section\n";
-    }    
-    
+    } 
     
     if($preserve_sections ne ""){
       $preserve_sections = "<div id=\"column-one\">\n" . $preserve_sections . "\n</div>\n";
     }
-    $preserve_sections = "</div></div></div>\n" . $preserve_sections . "\n</body>";    
-    
+    $preserve_sections = "</div></div></div>\n" . $preserve_sections . "\n</body>";   
+            
     $body_text =~ s/$print_footer/$preserve_sections/isg;
     
@@ -389 +388 @@
     my @forms;
     my $form_count = 0;
-    while($body_text =~ m/<form([^>]*)name=("|')([^>]*)("|')/isg){
-        next if($3 eq "q");
-        $forms[$form_count++] = $&;
+    while($body_text =~ m/<form([^>]*)name=("|')([^>"']*)?("|')/isg){
+        next if($3 eq "searchform");
+        $forms[$form_count++] = $&;        
     }
     foreach my $form (@forms) {      
       $body_text =~ s/$form[\s\S]*?<\/form>//m;
-    }    
-    
+    }
     
     # process links.