diff -ruN wiki.orig/Language.php wiki/Language.php --- wiki.orig/Language.php 2003-07-19 21:14:48.000000000 +0200 +++ wiki/Language.php 2003-07-20 21:45:23.000000000 +0200 @@ -56,7 +56,7 @@ "hover" => "Show hoverbox over wiki links", "underline" => "Underline links", "highlightbroken" => "Format broken links like -this (alternative: like this?).", +this (alternative: like this?).", "justify" => "Justify paragraphs", "hideminor" => "Hide minor edits in recent changes", "usenewrc" => "Enhanced recent changes (not for all browsers)", @@ -349,7 +349,7 @@ "redirectedfrom" => "(Redirected from $1)", "lastmodified" => "This page was last modified $1.", "viewcount" => "This page has been accessed $1 times.", -"gnunote" => "All text is available under the terms of the GNU Free Documentation License.", +"gnunote" => "All text is available under the terms of the GNU Free Documentation License.", "printsubtitle" => "(From http://www.wikipedia.org)", "protectedpage" => "Protected page", "administrators" => "Wikipedia:Administrators", diff -ruN wiki.orig/OutputPage.php wiki/OutputPage.php --- wiki.orig/OutputPage.php 2003-07-19 21:14:48.000000000 +0200 +++ wiki/OutputPage.php 2003-07-20 21:55:28.000000000 +0200 @@ -774,8 +774,8 @@ /* private */ function doQuotes( $pre, $text, $mode ) { if ( preg_match( "/^(.*)''(.*)$/sU", $text, $m ) ) { - $m1_strong = ($m[1] == "") ? "" : "{$m[1]}"; - $m1_em = ($m[1] == "") ? "" : "{$m[1]}"; + $m1_strong = ($m[1] == "") ? "" : "{$m[1]}"; + $m1_em = ($m[1] == "") ? "" : "{$m[1]}"; if ( substr ($m[2], 0, 1) == "'" ) { $m[2] = substr ($m[2], 1); if ($mode == "em") { @@ -785,7 +785,7 @@ } else if (($mode == "emstrong") || ($mode == "both")) { return $this->doQuotes ( "", $pre.$m1_strong.$m[2], "em" ); } else if ($mode == "strongem") { - return "{$pre}{$m1_em}" . $this->doQuotes ( "", $m[2], "em" ); + return "{$pre}{$m1_em}" . $this->doQuotes ( "", $m[2], "em" ); } else { return $m[1] . $this->doQuotes ( "", $m[2], "strong" ); } @@ -795,7 +795,7 @@ } else if ($mode == "em") { return $m1_em . $this->doQuotes ( "", $m[2], "" ); } else if ($mode == "emstrong") { - return "{$pre}{$m1_strong}" . $this->doQuotes ( "", $m[2], "strong" ); + return "{$pre}{$m1_strong}" . $this->doQuotes ( "", $m[2], "strong" ); } else if (($mode == "strongem") || ($mode == "both")) { return $this->doQuotes ( "", $pre.$m1_em.$m[2], "strong" ); } else { @@ -803,8 +803,8 @@ } } } else { - $text_strong = ($text == "") ? "" : "{$text}"; - $text_em = ($text == "") ? "" : "{$text}"; + $text_strong = ($text == "") ? "" : "{$text}"; + $text_em = ($text == "") ? "" : "{$text}"; if ($mode == "") { return $pre . $text; } else if ($mode == "em") { @@ -812,9 +812,9 @@ } else if ($mode == "strong") { return $pre . $text_strong; } else if ($mode == "strongem") { - return (($pre == "") && ($text == "")) ? "" : "{$pre}{$text_em}"; + return (($pre == "") && ($text == "")) ? "" : "{$pre}{$text_em}"; } else { - return (($pre == "") && ($text == "")) ? "" : "{$pre}{$text_strong}"; + return (($pre == "") && ($text == "")) ? "" : "{$pre}{$text_strong}"; } } } @@ -1470,7 +1470,7 @@ $text .= "ISBN $blank$x"; } else { $text .= "specialPage( - "Booksources"), "isbn={$num}" ) . "\" CLASS=\"internal\">ISBN $isbn"; + "Booksources"), "isbn={$num}" ) . "\">ISBN $isbn"; $text .= $x; } } diff -ruN wiki.orig/Skin.php wiki/Skin.php --- wiki.orig/Skin.php 2003-07-19 21:14:48.000000000 +0200 +++ wiki/Skin.php 2003-07-21 02:47:00.000000000 +0200 @@ -102,8 +102,7 @@ # Don't override browser settings } else { # Force no underline - $s .= "a.stub, a.new, a.internal, a.external { " . - "text-decoration: none; }\n"; + $s .= "a { text-decoration: none; }"; } if ( 1 == $wgUser->getOption( "highlightbroken" ) ) { $s .= "a.new, #quickbar a.new { color: #CC2200; }\n"; @@ -179,7 +178,7 @@ if ( $wgOut->isPrintable() ) { $r = " class='printable'"; } else if ( $broken == "stub" ) { $r = " class='stub'"; } else if ( $broken == "yes" ) { $r = " class='new'"; } - else { $r = " class='internal'"; } + else { $r = ""; } if ( 1 == $wgUser->getOption( "hover" ) ) { $r .= " title=\"{$link}\""; @@ -289,7 +288,7 @@ $lm = "
" . $this->lastModified(); } else { $lm = ""; } - $s .= "

{$rf}{$lm}\n"; + $s .= "

{$rf}{$lm}\n"; return $s; } return $this->doAfterContent(); @@ -363,7 +362,7 @@ $tl = $this->makeKnownLink( $wgLang->getNsText( Namespace::getTalk( Namespace::getUser() ) ) . ":{$n}", wfMsg("newmessageslink") ); - $s.=" | ". str_replace( "$1", $tl, wfMsg("newmessages") ) . ""; + $s.=" | ". str_replace( "$1", $tl, wfMsg("newmessages") ) . ""; } } return $s; @@ -511,7 +510,7 @@ $s = ""; if ( $wgOut->isArticle() ) { - $s .= "" . $this->editThisPage() . ""; + $s .= "" . $this->editThisPage() . ""; if ( 0 != $wgUser->getID() ) { $s .= $sep . $this->watchThisPage(); } @@ -612,7 +611,7 @@ if ( $wgOut->isArticle() || $action =="edit" || $action =="history" || $wpPreview) { if($wgOut->isArticle()) { - $s .= "" . $this->editThisPage() . ""; + $s .= "" . $this->editThisPage() . ""; } else { # backlink to the article in edit or history mode if($articleExists){ # no backlink if no article @@ -654,7 +653,7 @@ } elseif( $wgTitle->getNamespace() != Namespace::getSpecial() ) { # we just throw in a "New page" text to tell the user that he's in edit mode, # and to avoid messing with the separator that is prepended to the next item - $s .= "" . wfMsg("newpage") . ""; + $s .= "" . wfMsg("newpage") . ""; } } @@ -1231,7 +1230,7 @@ if ( "" == $alt ) { $alt = $name; } $u = wfEscapeHTML( $url ); - $s = "{$alt}"; + $s = "{$alt}"; return $s; } @@ -1329,11 +1328,11 @@ $s .= "({$curlink}) (!OLDID!{$oid}!) . ."; $M = wfMsg( "minoreditletter" ); - if ( $isminor ) { $s .= " {$M}"; } + if ( $isminor ) { $s .= " {$M}"; } $s .= " {$link} . . {$ul}"; - if ( "" != $c && "*" != $c ) { $s .= " (" . wfEscapeHTML($c) . ")"; } - $s .= "\n"; + if ( "" != $c && "*" != $c ) { $s .= " (" . wfEscapeHTML($c) . ")"; } + $s .= ""; $this->lastline = $s; return $ret; @@ -1354,7 +1353,7 @@ $r .= " ".$y->timestamp." " ; $r .= "" ; $link = $y->link ; - if ( $y->watched ) $link = "{$link}" ; + if ( $y->watched ) $link = "{$link}" ; $r .= $link ; $r .= " (" ; @@ -1365,7 +1364,7 @@ $r .= ") . . ".$y->userlink ; $r .= $y->usertalklink ; if ( $y->usercomment != "" ) - $r .= " (".wfEscapeHTML($y->usercomment).")" ; + $r .= " (".wfEscapeHTML($y->usercomment).")" ; $r .= "
\n" ; return $r ; } @@ -1419,7 +1418,7 @@ $r .= "" ; $link = $e->link ; - if ( $e->watched ) $link = "{$link}" ; + if ( $e->watched ) $link = "{$link}" ; $r .= $link ; if ( !$e->islog ) { @@ -1461,7 +1460,7 @@ $r .= ") . . ".$x->userlink ; $r .= $x->usertalklink ; if ( $x->usercomment != "" ) - $r .= " (".wfEscapeHTML($x->usercomment).")" ; + $r .= " (".wfEscapeHTML($x->usercomment).")" ; $r .= "
\n" ; } $r .= "\n" ; @@ -1516,7 +1515,7 @@ $nt = Title::newFromText( $t ); if ( $watched ) { - $clink = "{$clink}"; + $clink = "{$clink}"; } $hlink = $this->makeKnownLink( $t, wfMsg( "hist" ), "action=history" ); if ( $isnew || $nt->isLog() ) { @@ -1536,11 +1535,11 @@ $utl= $this->makeLink($utns . ":{$ut}", $talkname ); $cr = wfMsg( "currentrev" ); - $s .= "

  • ({$dlink}) ({$hlink}) . ."; + $s .= "
  • ({$dlink}) ({$hlink}) . ."; $M = wfMsg( "minoreditletter" ); $N = wfMsg( "newpageletter" ); - if ( $isminor ) { $s .= " {$M}"; } - if ( $isnew ) { $s .= "{$N}"; } + if ( $isminor ) { $s .= " {$M}"; } + if ( $isnew ) { $s .= "{$N}"; } $s .= " {$clink}; {$h} . . {$ul}"; $blink=""; @@ -1557,9 +1556,9 @@ $s.=" {$utl}"; if ( "" != $c && "*" != $c ) { - $s .= " (" . wfEscapeHTML( $c ) . ")"; + $s .= " (" . wfEscapeHTML( $c ) . ")"; } - $s .= "
  • \n"; + $s .= ""; return $s; } @@ -1683,13 +1682,13 @@ $nb = str_replace( "$1", $size, wfMsg( "nbytes" ) ); $style = $this->getInternalLinkAttributes( $url, $dt ); - $s = "
  • ({$dlink}) ({$rlink}) {$dt}" + $s = "
  • ({$dlink}) ({$rlink}) {$dt}" . " . . {$ul} ({$nb})"; if ( "" != $c && "*" != $c ) { - $s .= " (" . wfEscapeHTML( $c ) . ")"; + $s .= " (" . wfEscapeHTML( $c ) . ")"; } - $s .= "
  • \n"; + $s .= ""; return $s; } @@ -1710,11 +1709,11 @@ if($level) { - return "".$tocline."
    \n"; + return "".$tocline."
    \n"; } else { return "
    \n". - "".$tocline."
    \n". + "".$tocline."
    \n". "
    \n"; } diff -ruN wiki.orig/SpecialAsksql.php wiki/SpecialAsksql.php --- wiki.orig/SpecialAsksql.php 2003-07-19 21:14:48.000000000 +0200 +++ wiki/SpecialAsksql.php 2003-07-20 21:48:26.000000000 +0200 @@ -103,7 +103,7 @@ if( $x == "old_title" ) $namespace = $y->old_namespace; if( $x == "rc_title" ) $namespace = $y->rc_namespace; if( $namespace ) $o = $wgLang->getNsText( $namespace ) . ":" . $o; - $o = "" . + $o = "" . htmlspecialchars( $y->$x ) . "" ; } else { $o = htmlspecialchars( $o ); diff -ruN wiki.orig/SpecialIntl.php wiki/SpecialIntl.php --- wiki.orig/SpecialIntl.php 2003-07-19 21:14:48.000000000 +0200 +++ wiki/SpecialIntl.php 2003-07-20 21:49:19.000000000 +0200 @@ -80,12 +80,12 @@ function getArticleLink ( $title , $lang = "" ) { global $wgLanguageCode ; - $cl = "external" ; + $cl = " class='external'" ; if ( $lang == "" ) $lang = $wgLanguageCode ; - if ( $lang == $wgLanguageCode ) $cl = "internal" ; + if ( $lang == $wgLanguageCode ) $cl = "" ; $nt = Title::newFromText ( $title ) ; $link = "http://".$lang.".wikipedia.org/wiki/".$title ; - $link = "".$nt->getText()."" ; + $link = "".$nt->getText()."" ; return $link ; }