Move the hidden input with the title inside the <div> (adding a silly one for two...

Removes dumb XHTML1 conformance warning about <input> (an inline element) not being able to be there
(a place for a block element). (Bug 13381)

diff --git a/skins/Vector.php b/skins/Vector.php
index a9c4494..688d6ac 100644 (file)
--- a/skins/Vector.php
+++ b/skins/Vector.php
@@ -424,7 +424,6 @@ class VectorTemplate extends BaseTemplate {
 <div id="p-search">
        <h5<?php $this->html( 'userlangattributes' ) ?>><label for="searchInput"><?php $this->msg( 'search' ) ?></label></h5>
        <form action="<?php $this->text( 'wgScript' ) ?>" id="searchform">
-               <input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
                <?php if ( $wgVectorUseSimpleSearch && $this->getSkin()->getUser()->getOption( 'vector-simplesearch' ) ): ?>
                <div id="simpleSearch">
                        <?php if ( $this->data['rtl'] ): ?>
@@ -434,12 +433,14 @@ class VectorTemplate extends BaseTemplate {
                        <?php if ( !$this->data['rtl'] ): ?>
                        <?php echo $this->makeSearchButton( 'image', array( 'id' => 'searchButton', 'src' => $this->getSkin()->getSkinStylePath( 'images/search-ltr.png' ) ) ); ?>
                        <?php endif; ?>
-               </div>
                <?php else: ?>
-               <?php echo $this->makeSearchInput( array( 'id' => 'searchInput' ) ); ?>
-               <?php echo $this->makeSearchButton( 'go', array( 'id' => 'searchGoButton', 'class' => 'searchButton' ) ); ?>
-               <?php echo $this->makeSearchButton( 'fulltext', array( 'id' => 'mw-searchButton', 'class' => 'searchButton' ) ); ?>
+               <div>
+                       <?php echo $this->makeSearchInput( array( 'id' => 'searchInput' ) ); ?>
+                       <?php echo $this->makeSearchButton( 'go', array( 'id' => 'searchGoButton', 'class' => 'searchButton' ) ); ?>
+                       <?php echo $this->makeSearchButton( 'fulltext', array( 'id' => 'mw-searchButton', 'class' => 'searchButton' ) ); ?>
                <?php endif; ?>
+                       <input type='hidden' name="title" value="<?php $this->text( 'searchtitle' ) ?>"/>
+               </div>
        </form>
 </div>
 <?php