From 65150ca53ecb2743f0e33987f75688e25e5120c9 Mon Sep 17 00:00:00 2001 From: Alex Monk Date: Mon, 27 Aug 2012 20:41:00 +0100 Subject: [PATCH] (bug 39680) Convert valign to CSS vertical-align Also convert align to CSS text-align/float Change-Id: Ia7da2b51b7fdeee443def8cb06c63a422d89f6f1 --- includes/CategoryViewer.php | 2 +- includes/Skin.php | 2 +- includes/SkinLegacy.php | 6 +++--- includes/diff/DifferenceEngine.php | 8 ++++---- includes/specials/SpecialSearch.php | 4 ++-- includes/specials/SpecialUndelete.php | 4 ++-- skins/Standard.php | 2 +- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php index 4e4f311a0a..5f4aaeaa01 100644 --- a/includes/CategoryViewer.php +++ b/includes/CategoryViewer.php @@ -504,7 +504,7 @@ class CategoryViewer extends ContextSource { # Split into three columns $columns = array_chunk( $columns, ceil( count( $columns ) / 3 ), true /* preserve keys */ ); - $ret = ''; + $ret = '
'; $prevchar = null; foreach ( $columns as $column ) { diff --git a/includes/Skin.php b/includes/Skin.php index 5af6aec660..38f3895945 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -899,7 +899,7 @@ abstract class Skin extends ContextSource { */ function logoText( $align = '' ) { if ( $align != '' ) { - $a = " align='{$align}'"; + $a = " style='float: {$align};'"; } else { $a = ''; } diff --git a/includes/SkinLegacy.php b/includes/SkinLegacy.php index aa6b22a079..1ae1cb3cce 100644 --- a/includes/SkinLegacy.php +++ b/includes/SkinLegacy.php @@ -123,18 +123,18 @@ class LegacyTemplate extends BaseTemplate { "
\n\n"; if ( $this->getSkin()->qbSetting() == 0 ) { - $s .= "'; } $l = $wgLang->alignStart(); - $s .= "\n\n'; diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index d9092da863..3846473a59 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -917,7 +917,7 @@ class DifferenceEngine extends ContextSource { if ( !$diff && !$otitle ) { $header .= " - + "; $multiColspan = 1; @@ -935,17 +935,17 @@ class DifferenceEngine extends ContextSource { $multiColspan = 2; } $header .= " - + "; } if ( $multi != '' ) { - $header .= ""; + $header .= ""; } if ( $notice != '' ) { - $header .= ""; + $header .= ""; } return $header . $diff . "
\n" . + $s .= "\n" . $this->getSkin()->logoText( $wgLang->alignStart() ) . '\n"; + $s .= "\n"; $s .= $this->topLinks(); $s .= '

' . $this->pageTitleLinks() . "

\n"; $r = $wgLang->alignEnd(); - $s .= "		"; + $s .= ""; $s .= $this->nameAndLogin(); $s .= "\n
" . $this->searchForm() . '
{$ntitle}
{$otitle} {$ntitle}
{$multi}
{$multi}
{$notice}
{$notice}
"; diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php index 3344436ac3..85365f5dd9 100644 --- a/includes/specials/SpecialSearch.php +++ b/includes/specials/SpecialSearch.php @@ -667,10 +667,10 @@ class SpecialSearch extends SpecialPage { return "
  • " . '' . '' . - '' . - '" . "" . "" . - "\n" . - "\n" . "" . diff --git a/skins/Standard.php b/skins/Standard.php index e47b35f388..54613090c4 100644 --- a/skins/Standard.php +++ b/skins/Standard.php @@ -67,7 +67,7 @@ class StandardTemplate extends LegacyTemplate { wfProfileOut( __METHOD__ . '-1' ); wfProfileIn( __METHOD__ . '-2' ); $l = $this->getSkin()->getLanguage()->alignStart(); - $s .= "
    ' . + '' . $thumb->toHtml( array( 'desc-link' => true ) ) . '' . + '' . $link . $extract . "
    {$score}{$desc} - {$date}{$related}
    " . diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index e2eab73423..39a8a39eb5 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -914,10 +914,10 @@ class SpecialUndelete extends SpecialPage { "
    " . + "" . $this->diffHeader( $previousRev, 'o' ) . "" . + "" . $this->diffHeader( $currentRev, 'n' ) . "
    "; + $s .= ""; $s .= $this->bottomLinks(); $s .= "\n
    " . $this->getSkin()->getLanguage()->pipeList( array( -- 2.20.1