From 509775a7d010e9ed1c3d43a19282b7e36836b9c0 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 9 Apr 2004 08:27:00 +0000 Subject: [PATCH] XHTML clean-up. Started reformatting Preferences. Fixed some hard-coding of 'Vikipedio' in eo. --- includes/Article.php | 4 +- includes/EditPage.php | 2 +- includes/QueryPage.php | 4 +- includes/Skin.php | 6 +- includes/SpecialAllpages.php | 7 +- includes/SpecialCategories.php | 10 +- includes/SpecialExport.php | 2 +- includes/SpecialListusers.php | 4 +- includes/SpecialMakesysop.php | 22 +-- includes/SpecialPreferences.php | 178 +++++++++++++++--------- includes/SpecialRecentchangeslinked.php | 2 +- includes/SpecialStatistics.php | 6 +- includes/SpecialVersion.php | 4 +- languages/Language.php | 22 +-- languages/LanguageEo.php | 109 +++++++-------- 15 files changed, 217 insertions(+), 165 deletions(-) diff --git a/includes/Article.php b/includes/Article.php index 7ba998fc1a..29349d24be 100644 --- a/includes/Article.php +++ b/includes/Article.php @@ -693,13 +693,13 @@ class Article { $wgOut->setRobotpolicy( "noindex,follow" ); $sk = $wgUser->getSkin() ; - $link = $sk->makeKnownLink ( $this->mTitle->getPrefixedText() ) ; + $link = $this->mTitle->getPrefixedText(); if($add) $text = wfMsg( "addedwatchtext", $link ); else $text = wfMsg( "removedwatchtext", $link ); - $wgOut->addHTML( $text ); + $wgOut->addWikiText( $text ); $up = new UserUpdate(); array_push( $wgDeferredUpdateList, $up ); diff --git a/includes/EditPage.php b/includes/EditPage.php index 607c735650..20d651ce1f 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -312,7 +312,7 @@ class EditPage { if ( "preview" == $formtype) { $previewhead="

" . wfMsg( "preview" ) . "

\n

" . - wfMsg( "note" ) . wfMsg( "previewnote" ) . "

\n"; + wfMsg( "note" ) . wfMsg( "previewnote" ) . "

\n"; if ( $isConflict ) { $previewhead.="

" . wfMsg( "previewconflict" ) . "

\n"; diff --git a/includes/QueryPage.php b/includes/QueryPage.php index ee55b072cf..4f2dc0deaf 100644 --- a/includes/QueryPage.php +++ b/includes/QueryPage.php @@ -70,7 +70,7 @@ class QueryPage { $wgOut->addHTML( "

{$top}\n" ); $sl = wfViewPrevNext( $offset, $limit, $wgLang->specialPage( $sname ) ); - $wgOut->addHTML( "
{$sl}\n" ); + $wgOut->addHTML( "
{$sl}

\n" ); $s = "
    "; while ( $obj = wfFetchObject( $res ) ) { @@ -80,7 +80,7 @@ class QueryPage { wfFreeResult( $res ); $s .= "
"; $wgOut->addHTML( $s ); - $wgOut->addHTML( "

{$sl}\n" ); + $wgOut->addHTML( "

{$sl}

\n" ); # Saving cache diff --git a/includes/Skin.php b/includes/Skin.php index 6eafb8794c..d95550b43c 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -1757,6 +1757,7 @@ class Skin { $this->rcMoveIndex = 0; $this->rcCacheIndex = 0 ; $this->lastdate = ""; + $this->rclistOpen = false; return ""; } @@ -1772,7 +1773,9 @@ class Skin { function endRecentChangesList() { $s = $this->recentChangesBlock() ; - $s .= "\n"; + if( $this->rclistOpen ) { + $s .= "\n"; + } return $s; } @@ -2004,6 +2007,7 @@ class Skin { if ( "" != $this->lastdate ) { $s .= "\n"; } $s .= "

{$date}

\n