r94299 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r94298‎ | r94299 | r94300 >
Date:23:19, 11 August 2011
Author:robin
Status:ok
Tags:
Comment:
merge r94279 partially (fix for r91518): 'category-empty' was outside bodyContent
Modified paths:
  • /branches/REL1_18/phase3/includes/CategoryPage.php (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/includes/CategoryPage.php
@@ -172,14 +172,14 @@
173173 // Give a proper message if category is empty
174174 if ( $r == '' ) {
175175 $r = wfMsgExt( 'category-empty', array( 'parse' ) );
 176+ } else {
 177+ $pageLang = $this->title->getPageLanguage();
 178+ $langAttribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir() );
 179+ # close the previous div, show the headings in user language,
 180+ # then open a new div with the page content language again
 181+ $r = '</div>' . $r . Html::openElement( 'div', $langAttribs );
176182 }
177183
178 - $pageLang = $this->title->getPageLanguage();
179 - $langAttribs = array( 'lang' => $pageLang->getCode(), 'dir' => $pageLang->getDir() );
180 - # close the previous div, show the headings in user language,
181 - # then open a new div with the page content language again
182 - $r = '</div>' . $r . Html::openElement( 'div', $langAttribs );
183 -
184184 wfProfileOut( __METHOD__ );
185185 return $wgContLang->convert( $r );
186186 }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r91518(bug 6100; follow-up to r91315) Being bold and removing $wgBetterDirectionali...robin02:26, 6 July 2011
r94279* CategoryPage.php: fix the "category-empty" message per comment on r91518, i...robin19:58, 11 August 2011

Status & tagging log