HTML tweaks inching towards XHTML-friendly output. To test:

	$wgMimeType = "text/xml";
	$wgDocType = "-//W3C//DTD XHTML 1.0 Transitional//EN";
	$wgDTD = "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";

Mozilla will spit out angry erorrs at all the well-formedness errors.

diff --git a/includes/Article.php b/includes/Article.php
index a04ec9b..8305d3a 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -790,8 +790,8 @@ class Article {
                $res = wfQuery( $sql, DB_READ, $fname );
                if( ($old=wfFetchObject($res)) && !$confirm ) {
                        $skin=$wgUser->getSkin();
-                       $wgOut->addHTML("<B>".wfMsg("historywarning"));
-                       $wgOut->addHTML( $skin->historyLink() ."</B><P>");
+                       $wgOut->addHTML("<b>".wfMsg("historywarning"));
+                       $wgOut->addHTML( $skin->historyLink() ."</b><p>");
                }
 
                $sql="SELECT cur_text FROM cur WHERE cur_namespace=$ns and cur_title='$etitle'";
@@ -857,22 +857,40 @@ class Article {
 
                $formaction = $this->mTitle->escapeLocalURL( "action=delete" . $par );
                
-               $confirm = wfMsg( "confirm" );
-               $check = wfMsg( "confirmcheck" );
-               $delcom = wfMsg( "deletecomment" );
+               $confirm = htmlspecialchars( wfMsg( "confirm" ) );
+               $check = htmlspecialchars( wfMsg( "confirmcheck" ) );
+               $delcom = htmlspecialchars( wfMsg( "deletecomment" ) );
 
                $wgOut->addHTML( "
-<form id=\"deleteconfirm\" method=\"post\" action=\"{$formaction}\">
-<table border=0><tr><td align=right>
-{$delcom}:</td><td align=left>
-<input type=text size=60 name=\"wpReason\" value=\"" . htmlspecialchars( $reason ) . "\">
-</td></tr><tr><td>&nbsp;</td></tr>
-<tr><td align=right>
-<input type=checkbox name=\"wpConfirm\" value='1' id=\"wpConfirm\">
-</td><td><label for=\"wpConfirm\">{$check}</label></td>
-</tr><tr><td>&nbsp;</td><td>
-<input type=submit name=\"wpConfirmB\" value=\"{$confirm}\">
-</td></tr></table></form>\n" );
+<form id='deleteconfirm' method='post' action=\"{$formaction}\">
+       <table border='0'>
+               <tr>
+                       <td align='right'>
+                               <label for='wpReason'>{$delcom}:</label>
+                       </td>
+                       <td align='left'>
+                               <input type='text' size='60' name='wpReason' id='wpReason' value=\"" . htmlspecialchars( $reason ) . "\" />
+                       </td>
+               </tr>
+               <tr>
+                       <td>&nbsp;</td>
+               </tr>
+               <tr>
+                       <td align='right'>
+                               <input type='checkbox' name='wpConfirm' value='1' id='wpConfirm' />
+                       </td>
+                       <td>
+                               <label for='wpConfirm'>{$check}</label>
+                       </td>
+               </tr>
+               <tr>
+                       <td>&nbsp;</td>
+                       <td>
+                               <input type='submit' name='wpConfirmB' value=\"{$confirm}\" />
+                       </td>
+               </tr>
+       </table>
+</form>\n" );
 
                $wgOut->returnToMain( false );
        }
@@ -1090,7 +1108,7 @@ class Article {
                $newcomment = wfMsg( "revertpage", $s->old_user_text, $from );
                $wgOut->setPagetitle( wfMsg( "actioncomplete" ) );
                $wgOut->setRobotpolicy( "noindex,nofollow" );
-               $wgOut->addHTML( "<h2>" . $newcomment . "</h2>\n<hr>\n" );
+               $wgOut->addHTML( "<h2>" . $newcomment . "</h2>\n<hr />\n" );
                $this->updateArticle( Article::getRevisionText( $s ), $newcomment, 1, $this->mTitle->userIsWatching(), $bot );
                Article::onArticleEdit( $this->mTitle );
                $wgOut->returnToMain( false );

diff --git a/includes/Database.php b/includes/Database.php
index 64cfbf1..d3ed827 100644 (file)
--- a/includes/Database.php
+++ b/includes/Database.php
@@ -466,7 +466,7 @@ function wfEmergencyAbort( &$conn ) {
 
                $cache = new CacheManager( $t );
                if( $cache->isFileCached() ) {
-                       $msg = "<p style='color: red'><b>$msg<br>\n" .
+                       $msg = "<p style='color: red'><b>$msg<br />\n" .
                                wfMsgNoDB( "cachederror" ) . "</b></p>\n";
                        
                        $tag = "<div id='article'>";

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 5290a14..c0cc8a4 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -90,6 +90,7 @@ $wgInterwikiMagic     = true; # Treat language links as magic connectors, not inline
 $wgInputEncoding       = "ISO-8859-1";
 $wgOutputEncoding      = "ISO-8859-1";
 $wgEditEncoding                = "";
+$wgMimeType                    = "text/html";
 $wgDocType          = "-//W3C//DTD HTML 4.01 Transitional//EN";
 $wgDTD              = "http://www.w3.org/TR/html4/loose.dtd";
 $wgUseDynamicDates  = false; # Enable to allow rewriting dates in page text

diff --git a/includes/DifferenceEngine.php b/includes/DifferenceEngine.php
index c33e950..4664515 100644 (file)
--- a/includes/DifferenceEngine.php
+++ b/includes/DifferenceEngine.php
@@ -50,12 +50,12 @@ class DifferenceEngine {
                        $rollback = "";
                }
 
-               $oldHeader = "<strong>{$this->mOldtitle}</strong><br>$oldUserLink ($oldUTLink | $oldContribs)";
-               $newHeader = "<strong>{$this->mNewtitle}</strong><br>$newUserLink ($newUTLink | $newContribs) $rollback";
+               $oldHeader = "<strong>{$this->mOldtitle}</strong><br />$oldUserLink ($oldUTLink | $oldContribs)";
+               $newHeader = "<strong>{$this->mNewtitle}</strong><br />$newUserLink ($newUTLink | $newContribs) $rollback";
 
                DifferenceEngine::showDiff( $this->mOldtext, $this->mNewtext,
                  $oldHeader, $newHeader );
-               $wgOut->addHTML( "<hr><h2>{$this->mNewtitle}</h2>\n" );
+               $wgOut->addHTML( "<hr /><h2>{$this->mNewtitle}</h2>\n" );
                $wgOut->addWikiText( $this->mNewtext );
        }
 
@@ -68,11 +68,11 @@ class DifferenceEngine {
                $nta = explode( "\n", str_replace( "\r\n", "\n",
                  htmlspecialchars( $ntext ) ) );
 
-               $wgOut->addHTML( "<table border=0 width='98%'
-cellpadding=0 cellspacing='4px' class='special'><tr>
-<td colspan=2 width='50%' align=center bgcolor='#cccccc'>
+               $wgOut->addHTML( "<table border='0' width='98%'
+cellpadding='0' cellspacing='4px' class='special'><tr>
+<td colspan='2' width='50%' align='center' bgcolor='#cccccc'>
 {$otitle}</td>
-<td colspan=2 width='50%' align=center bgcolor='#cccccc'>
+<td colspan='2' width='50%' align='center' bgcolor='#cccccc'>
 {$ntitle}</td>
 </tr>\n" );
 
@@ -1087,8 +1087,8 @@ class TableDiffFormatter extends DiffFormatter
                $l1 = wfMsg( "lineno", $xbeg );
                $l2 = wfMsg( "lineno", $ybeg );
 
-               $r = "<tr><td colspan=2 align=left><strong>{$l1}</strong></td>\n" .
-                 "<td colspan=2 align=left><strong>{$l2}</strong></td></tr>\n";
+               $r = "<tr><td colspan='2' align='left'><strong>{$l1}</strong></td>\n" .
+                 "<td colspan='2' align='left'><strong>{$l2}</strong></td></tr>\n";
                return $r;
        }
 

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 058e73d..8ce60fa 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -297,7 +297,7 @@ class EditPage {
 
                if ( 0 != $wgUser->getID() || $wgAllowAnonymousMinor ) {
                        $minoredithtml =
-                       "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked":"")." id='wpMinoredit'>".
+                       "<input tabindex='3' type='checkbox' value='1' name='wpMinoredit'".($this->minoredit?" checked":"")." id='wpMinoredit' />".
                        "<label for='wpMinoredit'>{$minor}</label>";
                }
 
@@ -359,14 +359,14 @@ cols='{$cols}'{$ew} wrap=\"virtual\">" .
 htmlspecialchars( $wgLang->recodeForEdit( $this->textbox1 ) ) .
 "
 </textarea>
-<br>{$editsummary}
+<br />{$editsummary}
 {$checkboxhtml}
-<input tabindex='5' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"s\">
-<input tabindex='6' type='submit' value=\"{$prev}\" name=\"wpPreview\" accesskey=\"p\">
+<input tabindex='5' type='submit' value=\"{$save}\" name=\"wpSave\" accesskey=\"s\" />
+<input tabindex='6' type='submit' value=\"{$prev}\" name=\"wpPreview\" accesskey=\"p\" />
 <em>{$cancel}</em> | <em>{$edithelp}</em>
-<br><br>{$copywarn}
-<input type=hidden value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\">
-<input type=hidden value=\"{$this->edittime}\" name=\"wpEdittime\">\n" );
+<br /><br />{$copywarn}
+<input type='hidden' value=\"" . htmlspecialchars( $this->section ) . "\" name=\"wpSection\" />
+<input type='hidden' value=\"{$this->edittime}\" name=\"wpEdittime\" />\n" );
 
                if ( $isConflict ) {
                        $wgOut->addHTML( "<h2>" . wfMsg( "yourdiff" ) . "</h2>\n" );

diff --git a/includes/ImagePage.php b/includes/ImagePage.php
index dab95ac..4ba864d 100644 (file)
--- a/includes/ImagePage.php
+++ b/includes/ImagePage.php
@@ -38,7 +38,7 @@ class ImagePage extends Article {
                        
                        if ( $type != "" ) {
                                # image
-                               $s = "<center><img src=\"{$url}\" width=\"{$width}\" height=\"{$height}\"></center>";
+                               $s = "<center><img src=\"{$url}\" width=\"{$width}\" height=\"{$height}\" /></center>";
                        } else {
                                $s = "<center>".$sk->makeMediaLink($name,"")."</center>";
                        }

diff --git a/includes/Math.php b/includes/Math.php
index 798b569..4c24af5 100644 (file)
--- a/includes/Math.php
+++ b/includes/Math.php
@@ -3,7 +3,9 @@
 function linkToMathImage ( $tex, $outputhash )
 {
        global $wgMathPath;
-       return "<img src=\"".$wgMathPath."/".$outputhash.".png\" alt=\"".wfEscapeHTML($tex)."\">";
+       $url = htmlspecialchars( "$wgMathPath/$outputhash.png";
+       $alt = htmlspecialchars( $tex );
+       return "<img class='tex' src=\"$url\" alt=\"$alt\" />";
 }
 
 function renderMath( $tex )

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 80f0496..6ad71b3 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -239,7 +239,7 @@ class OutputPage {
        {
                global $wgUser, $wgLang, $wgDebugComments, $wgCookieExpiration;
                global $wgInputEncoding, $wgOutputEncoding, $wgLanguageCode;
-               global $wgDebugRedirects;
+               global $wgDebugRedirects, $wgMimeType;
                if( $this->mDoNothing ){
                        return;
                }
@@ -277,7 +277,7 @@ class OutputPage {
                
                $this->sendCacheControl();
                
-               header( "Content-type: text/html; charset={$wgOutputEncoding}" );
+               header( "Content-type: $wgMimeType; charset={$wgOutputEncoding}" );
                header( "Content-language: {$wgLanguageCode}" );
 
                $exp = time() + $wgCookieExpiration;
@@ -572,16 +572,30 @@ class OutputPage {
 
        /* private */ function headElement()
        {
-               global $wgDocType, $wgDTD, $wgUser, $wgLanguageCode, $wgOutputEncoding, $wgLang, $wgRequest;
+               global $wgDocType, $wgDTD, $wgLanguageCode, $wgOutputEncoding, $wgMimeType;
+               global $wgUser, $wgLang, $wgRequest;
 
-               $ret = "<!DOCTYPE HTML PUBLIC \"$wgDocType\"\n        \"$wgDTD\">\n";
+               $xml = ($wgMimeType == 'text/xml');
+               if( $xml ) {
+                       $ret = "<" . "?xml version=\"1.0\" encoding=\"$wgOutputEncoding\" ?" . ">\n";
+               } else {
+                       $ret = "";
+               }
+               
+               $ret .= "<!DOCTYPE HTML PUBLIC \"$wgDocType\"\n        \"$wgDTD\">\n";
 
                if ( "" == $this->mHTMLtitle ) {
                        $this->mHTMLtitle = $this->mPagetitle;
                }
+               if( $xml ) {
+                       $xmlbits = "xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\"";
+               } else {
+                       $xmlbits = "";
+               }
                $rtl = $wgLang->isRTL() ? " dir='RTL'" : "";
-               $ret .= "<html lang=\"$wgLanguageCode\"$rtl><head><title>{$this->mHTMLtitle}</title>\n";
-               array_push( $this->mMetatags, array( "http:Content-type", "text/html; charset={$wgOutputEncoding}" ) );
+               $ret .= "<html $xmlbits lang=\"$wgLanguageCode\" $rtl>\n";
+               $ret .= "<head>\n<title>{$this->mHTMLtitle}</title>\n";
+               array_push( $this->mMetatags, array( "http:Content-type", "$wgMimeType; charset={$wgOutputEncoding}" ) );
                foreach ( $this->mMetatags as $tag ) {
                        if ( 0 == strcasecmp( "http:", substr( $tag[0], 0, 5 ) ) ) {
                                $a = "http-equiv";
@@ -589,15 +603,15 @@ class OutputPage {
                        } else {
                                $a = "name";
                        }
-                       $ret .= "<meta $a=\"{$tag[0]}\" content=\"{$tag[1]}\">\n";
+                       $ret .= "<meta $a=\"{$tag[0]}\" content=\"{$tag[1]}\" />\n";
                }
                $p = $this->mRobotpolicy;
                if ( "" == $p ) { $p = "index,follow"; }
-               $ret .= "<meta name=\"robots\" content=\"$p\">\n";
+               $ret .= "<meta name=\"robots\" content=\"$p\" />\n";
 
                if ( count( $this->mKeywords ) > 0 ) {
                        $ret .= "<meta name=\"keywords\" content=\"" .
-                         implode( ",", $this->mKeywords ) . "\">\n";
+                         implode( ",", $this->mKeywords ) . "\" />\n";
                }
                foreach ( $this->mLinktags as $tag ) {
                        $ret .= "<link ";
@@ -605,11 +619,11 @@ class OutputPage {
                        if ( "" != $tag[1] ) { $ret .= "rev=\"{$tag[1]}\" "; }
                        if ( !empty( $tag[3] ) ) { $ret .= "type=\"{$tag[3]}\" "; }
                        if ( !empty( $tag[4] ) ) { $ret .= "media=\"{$tag[4]}\" "; }
-                       $ret .= "href=\"{$tag[2]}\">\n";
+                       $ret .= "href=\"{$tag[2]}\" />\n";
                }
                if( $this->isSyndicated() ) {
                        $link = $wgRequest->escapeAppendQuery( "feed=rss" );
-                       $ret .= "<link rel='alternate' type='application/rss+xml' title='RSS' href='$link'>\n";
+                       $ret .= "<link rel='alternate' type='application/rss+xml' title='RSS' href='$link' />\n";
                }
                global $wgStyleSheetPath;
                if( $this->isPrintable() ) {
@@ -618,7 +632,7 @@ class OutputPage {
                        $media = "media='print'";
                }
                $printsheet = htmlspecialchars( "$wgStyleSheetPath/wikiprintable.css" );
-               $ret .= "<link rel='stylesheet' type='text/css' $media href='$printsheet'>\n";
+               $ret .= "<link rel='stylesheet' type='text/css' $media href='$printsheet' />\n";
 
                $sk = $wgUser->getSkin();
                $ret .= $sk->getHeadScripts();

diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index 6a001cd..f01764e 100644 (file)
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -188,7 +188,7 @@ class PageHistory {
                }
                $arbitrary = "";
                if( $this->linesonpage > 1)
-                       $arbitrary = "<input type='checkbox' onclick='anysel($oid)' title='Select any two versions to diff them'>";
+                       $arbitrary = "<input type='checkbox' onclick='anysel($oid)' title='Select any two versions to diff them' />";
                $s .= "({$curlink}) (!OLDID!{$oid}!) $arbitrary . .";
                $M = wfMsg( "minoreditletter" );
                if ( $isminor ) {

diff --git a/includes/Parser.php b/includes/Parser.php
index 7fc5037..b526d2d 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -207,7 +207,7 @@ class Parser
                $ti = $this->mTitle->getText() ;
                $ti = explode ( ":" , $ti , 2 ) ;
                if ( $cat != $ti[0] ) return "" ;
-               $r = "<br break='all'/>\n" ;
+               $r = "<br break='all' />\n" ;
 
                $articles = array() ;
                $parents = array () ;
@@ -417,7 +417,7 @@ class Parser
                $text = $this->replaceVariables( $text );
 
                # $text = preg_replace( "/(^|\n)-----*/", "\\1<hr>", $text );
-               $text = str_replace ( "<HR>", "<hr/>", $text );
+               $text = str_replace ( "<HR>", "<hr />", $text );
 
                $text = $this->doHeadings( $text );
                $text = $this->doBlockLevels( $text, $linestart );
@@ -682,7 +682,7 @@ class Parser
                                        $tagIsOpen = (count( $tokenStack ) != 0);
                                        break;
                                case "----":
-                                       $txt = "\n<hr/>\n";
+                                       $txt = "\n<hr />\n";
                                        break;
                                case "'''":
                                        # This and the three next ones handle quotes

diff --git a/includes/Skin.php b/includes/Skin.php
index 429efdf..13c345d 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -35,7 +35,7 @@ function getCategories ()
   if ( !$wgOut->isArticle() ) return "" ;
   $sk = $wgUser->getSkin() ;
   $s = "" ;
-  $s .=  "\n<br>\n";
+  $s .=  "\n<br />\n";
   $s .= $sk->makeKnownLink ( "Special:Categories" , "Categories" , "article=".$wgTitle->getDBkey() ) ;
   $t = implode ( " | " , $wgOut->mCategoryLinks ) ;
   if ( $t != "" ) $s .= " : " ;
@@ -122,7 +122,7 @@ class Skin {
                }
                $out->out( $this->beforeContent() );
 
-               $out->out( $out->mBodytext );
+               $out->out( $out->mBodytext . "\n" );
 
                $out->out( $this->afterContent() );
                
@@ -142,12 +142,12 @@ class Skin {
        {
                global $wgOut, $wgStyleSheetPath;
                $sheet = $this->getStylesheet();
-               $s = "<style type='text/css'><!--\n";
+               $s = "<style type='text/css'>\n";
                $s .= "/*/*/\n"; # <-- Hide the styles from Netscape 4 without hiding them from IE/Mac
                $s .= "@import url(\"$wgStyleSheetPath/$sheet\");\n";
                $s .= $this->doGetUserStyles();
                $s .= "/* */\n";
-               $s .= "//--></style>\n";
+               $s .= "</style>\n";
                return $s;
        }
 
@@ -298,39 +298,39 @@ class Skin {
                        $borderhack = "class='top'";
                }
 
-               $s .= "\n<div id='content'>\n<div id='topbar'>" .
-                 "<table border=0 cellspacing=0 width='98%'><tr>";
+               $s .= "\n<div id='content'>\n<div id='topbar'>\n" .
+                 "<table border='0' cellspacing='0' width='98%'>\n<tr>\n";
 
                $shove = ($qb != 0);
                $left = ($qb == 1 || $qb == 3);
                if($wgLang->isRTL()) $left = !$left;
                
                if ( !$shove ) {
-                       $s .= "<td class='top' align=left valign=top rowspan='{$rows}'>" .
+                       $s .= "<td class='top' align=left valign=top rowspan='{$rows}'>\n" .
                          $this->logoText() . "</td>";
                } elseif( $left ) {
                        $s .= $this->getQuickbarCompensator( $rows );
                }
                $l = $wgLang->isRTL() ? "right" : "left";
-               $s .= "<td {$borderhack} align='$l' valign='top'>";
+               $s .= "<td {$borderhack} align='$l' valign='top'>\n";
 
                $s .= $this->topLinks() ;
-               $s .= "<p class='subtitle'>" . $this->pageTitleLinks();
+               $s .= "<p class='subtitle'>" . $this->pageTitleLinks() . "</p>\n";
 
                $r = $wgLang->isRTL() ? "left" : "right";
-               $s .= "</td>\n<td {$borderhack} valign='top' align='$r' nowrap>";
+               $s .= "</td>\n<td {$borderhack} valign='top' align='$r' nowrap='nowrap'>";
                $s .= $this->nameAndLogin();
-               $s .= "\n<br>" . $this->searchForm() . "</td>";
+               $s .= "\n<br />" . $this->searchForm() . "</td>";
 
                if ( $langlinks ) {
-                       $s .= "</tr>\n<tr><td class='top' colspan=\"2\">$langlinks</td>";
+                       $s .= "</tr>\n<tr>\n<td class='top' colspan=\"2\">$langlinks</td>\n";
                }
 
                if ( $shove && !$left ) { # Right
                        $s .= $this->getQuickbarCompensator( $rows );
                }
-               $s .= "</tr></table>\n</div>\n";
-               $s .= "\n<div id='article'>";
+               $s .= "</tr>\n</table>\n</div>\n";
+               $s .= "\n<div id='article'>\n";
 
                $s .= $this->pageTitle();
                $s .= $this->pageSubtitle() ;
@@ -352,7 +352,7 @@ class Skin {
                global $wgUser, $wgOut, $wgServer;
                global $wgTitle, $wgLang;
                
-               $printfooter = "<div class=\"printfooter\">" . $this->printFooter() . "</div>\n";
+               $printfooter = "<div class=\"printfooter\">\n" . $this->printFooter() . "</div>\n";
                return $printfooter . $this->doAfterContent();
        }
        
@@ -370,9 +370,9 @@ class Skin {
                wfProfileIn( $fname );
                wfProfileIn( "$fname-1" );
 
-               $s = "\n</div><br clear=all>\n";
+               $s = "\n</div><br clear='all' />\n";
                $s .= "\n<div id='footer'>";
-               $s .= "<table border=0 cellspacing=0><tr>";
+               $s .= "<table border='0' cellspacing='0'><tr>";
                
                wfProfileOut( "$fname-1" );
                wfProfileIn( "$fname-2" );
@@ -391,11 +391,11 @@ class Skin {
                $s .= "<td class='bottom' align='$l' valign='top'>";
 
                $s .= $this->bottomLinks();
-               $s .= "\n<br>" . $this->mainPageLink()
+               $s .= "\n<br />" . $this->mainPageLink()
                  . " | " . $this->aboutLink()
                  . " | " . $this->specialLink( "recentchanges" )
                  . " | " . $this->searchForm()
-                 . "<br><span id='pagestats'>" . $this->pageStats() . "</span>";
+                 . "<br /><span id='pagestats'>" . $this->pageStats() . "</span>";
 
                $s .= "</td>";
                if ( $shove && !$left ) { # Right
@@ -534,7 +534,7 @@ class Skin {
                                }
                        }
                }
-               $s = "<p class='subtitle'>{$sub}\n";
+               $s = "<p class='subtitle'>{$sub}</p>\n";
                return $s;
        }
 
@@ -564,7 +564,7 @@ class Skin {
                                $q = "";
                        } else { $q = "returnto={$rt}"; }
                        
-                       $s .= "\n<br>" . $this->makeKnownLink( $li,
+                       $s .= "\n<br />" . $this->makeKnownLink( $li,
                          wfMsg( "login" ), $q );
                } else {
                        $n = $wgUser->getName();
@@ -576,7 +576,7 @@ class Skin {
                        $tl = " ({$tl})"; 
                        
                        $s .= $this->makeKnownLink( $wgLang->getNsText(
-                         Namespace::getUser() ) . ":{$n}", $n ) . "{$tl}<br>" .
+                         Namespace::getUser() ) . ":{$n}", $n ) . "{$tl}<br />" .
                          $this->makeKnownLink( $lo, wfMsg( "logout" ),
                          "returnto={$rt}" ) . " | " .
                          $this->specialLink( "preferences" );
@@ -593,12 +593,12 @@ class Skin {
 
                $search = $wgRequest->getText( 'search' );;
 
-               $s = "<form name='search' class='inline' method=post action=\""
-                 . wfLocalUrl( "" ) . "\">"
-                 . "<input type=text name=\"search\" size=19 value=\""
-                 . htmlspecialchars(substr($search,0,256)) . "\">\n"
-                 . "<input type=submit name=\"go\" value=\"" . wfMsg ("go") . "\">&nbsp;"
-                 . "<input type=submit name=\"fulltext\" value=\"" . wfMsg ("search") . "\"></form>";
+               $s = "<form name='search' class='inline' method='post' action=\""
+                 . wfLocalUrl( "" ) . "\">\n"
+                 . "<input type='text' name=\"search\" size='19' value=\""
+                 . htmlspecialchars(substr($search,0,256)) . "\" />\n"
+                 . "<input type='submit' name=\"go\" value=\"" . wfMsg ("go") . "\" />&nbsp;"
+                 . "<input type='submit' name=\"fulltext\" value=\"" . wfMsg ("search") . "\" />\n</form>";
 
                return $s;
        }
@@ -654,11 +654,11 @@ class Skin {
                                }
                        }
                        if ( $wgUser->isSysop() && $wgTitle->getArticleId() ) {
-                               $s .= "\n<br>" . $this->deleteThisPage() .
+                               $s .= "\n<br />" . $this->deleteThisPage() .
                                $sep . $this->protectThisPage() .
                                $sep . $this->moveThisPage();
                        }
-                       $s .= "<br>\n" . $this->otherLanguages();
+                       $s .= "<br />\n" . $this->otherLanguages();
                }
                return $s;
        }
@@ -707,7 +707,7 @@ class Skin {
                $mp = wfMsg( "mainpage" );
                $titleObj = Title::newFromText( $mp );
                $s = "<a href=\"" . $titleObj->escapeLocalURL()
-                 . "\"><img{$a} border=0 src=\""
+                 . "\"><img{$a} border='0' src=\""
                  . $this->getLogo() . "\" alt=\"" . "[{$mp}]\" /></a>";
                return $s;
        }
@@ -725,9 +725,9 @@ class Skin {
                $tns=$wgTitle->getNamespace();
 
                $s = "\n<div id='quickbar'>";
-               $s .= "\n" . $this->logoText() . "\n<hr class='sep'>";
+               $s .= "\n" . $this->logoText() . "\n<hr class='sep' />";
 
-               $sep = "\n<br>";
+               $sep = "\n<br />";
                $s .= $this->mainPageLink()
                  . $sep . $this->specialLink( "recentchanges" )
                  . $sep . $this->specialLink( "randompage" );
@@ -739,7 +739,7 @@ class Skin {
                }
                // only show watchlist link if logged in
                if ( wfMsg ( "currentevents" ) != "-" ) $s .= $sep . $this->makeKnownLink( wfMsg( "currentevents" ), "" ) ;
-               $s .= "\n<br><hr class='sep'>";
+               $s .= "\n<br /><hr class='sep' />";
                $articleExists = $wgTitle->getArticleId();
                if ( $wgOut->isArticle() || $action =="edit" || $action =="history" || $wpPreview) {                            
                        if($wgOut->isArticle()) {
@@ -791,7 +791,7 @@ class Skin {
                        
 
                        if( $tns%2 && $action!="edit" && !$wpPreview) {
-                               $s.="<br>".$this->makeKnownLink($wgTitle->getPrefixedText(),wfMsg("postcomment"),"action=edit&section=new");
+                               $s.="<br />".$this->makeKnownLink($wgTitle->getPrefixedText(),wfMsg("postcomment"),"action=edit&section=new");
                        }
 
                        /*
@@ -838,7 +838,7 @@ class Skin {
                                        }
                                }
                        }
-                       $s .= "\n<br><hr class='sep'>";
+                       $s .= "\n<br /><hr class='sep' />";
                } 
                
                if ( 0 != $wgUser->getID() && ( !$wgDisableUploads || $wgRemoteUploads ) ) {
@@ -849,11 +849,11 @@ class Skin {
                
                global $wgSiteSupportPage;
                if( $wgSiteSupportPage ) {
-                       $s .= "\n<br><a href=\"" . htmlspecialchars( $wgSiteSupportPage ) .
+                       $s .= "\n<br /><a href=\"" . htmlspecialchars( $wgSiteSupportPage ) .
                          "\" class=\"internal\">" . wfMsg( "sitesupport" ) . "</a>";
                }
        
-               $s .= "\n<br></div>\n";
+               $s .= "\n<br /></div>\n";
                wfProfileOut( $fname );
                return $s;
        }
@@ -1821,7 +1821,7 @@ class Skin {
                        $r .= $wgLang->emphasize( " (".$rc_comment.")" );
                }
 
-               $r .= "<br>\n" ;
+               $r .= "<br />\n" ;
                return $r ;
        }
 
@@ -1897,7 +1897,7 @@ class Skin {
                }
 
                $r .= $users ;
-               $r .= "<br>\n" ;
+               $r .= "<br />\n" ;
 
                # Sub-entries
                $r .= "<div id='{$rci}' style='display:none'>" ;
@@ -1935,7 +1935,7 @@ class Skin {
                                $rc_comment=$this->formatComment($rc_comment);
                                $r .= $wgLang->emphasize( " (".$rc_comment.")" ) ;
                        }
-                       $r .= "<br>\n" ;
+                       $r .= "<br />\n" ;
                }
                $r .= "</div>\n" ;
 

diff --git a/languages/LanguageFr.php b/languages/LanguageFr.php
index 06bdd6d..d101a90 100644 (file)
--- a/languages/LanguageFr.php
+++ b/languages/LanguageFr.php
@@ -206,7 +206,7 @@ include_once( "LanguageUtf8.php" );
 "redirectedfrom" => "(Redirigé depuis $1)",
 "lastmodified"  => "Dernière modification de cette page : $1.",
 "viewcount"     => "Cette page a été consultée $1 fois.",
-"gnunote"       => "Tous les textes sont disponibles sous les termes de la <a class=internal href='/wiki/GFDL'>Licence de documentation libre GNU</a>.",
+"gnunote"       => "Tous les textes sont disponibles sous les termes de la <a href='/wiki/GFDL'>Licence de documentation libre GNU</a>.",
 "printsubtitle" => "(de http://$wgServer)",
 "protectedpage" => "Page protégée",
 "administrators" => "$wgMetaNamespace:Administrateurs",