http://www.mediawiki.org/wiki/Special:Code/MediaWiki/94299
Revision: 94299
Author: robin
Date: 2011-08-11 23:19:21 +0000 (Thu, 11 Aug 2011)
Log Message:
-----------
merge r94279 partially (fix for r91518): 'category-empty' was outside
bodyContent
Modified Paths:
--------------
branches/REL1_18/phase3/includes/CategoryPage.php
Modified: branches/REL1_18/phase3/includes/CategoryPage.php
===================================================================
--- branches/REL1_18/phase3/includes/CategoryPage.php 2011-08-11 23:18:32 UTC
(rev 94298)
+++ branches/REL1_18/phase3/includes/CategoryPage.php 2011-08-11 23:19:21 UTC
(rev 94299)
@@ -172,14 +172,14 @@
// Give a proper message if category is empty
if ( $r == '' ) {
$r = wfMsgExt( 'category-empty', array( 'parse' ) );
+ } else {
+ $pageLang = $this->title->getPageLanguage();
+ $langAttribs = array( 'lang' => $pageLang->getCode(),
'dir' => $pageLang->getDir() );
+ # close the previous div, show the headings in user
language,
+ # then open a new div with the page content language
again
+ $r = '</div>' . $r . Html::openElement( 'div',
$langAttribs );
}
- $pageLang = $this->title->getPageLanguage();
- $langAttribs = array( 'lang' => $pageLang->getCode(), 'dir' =>
$pageLang->getDir() );
- # close the previous div, show the headings in user language,
- # then open a new div with the page content language again
- $r = '</div>' . $r . Html::openElement( 'div', $langAttribs );
-
wfProfileOut( __METHOD__ );
return $wgContLang->convert( $r );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
