Index: trunk/extensions/intersection/DynamicPageList.php |
— | — | @@ -74,7 +74,7 @@ |
75 | 75 | |
76 | 76 | // The callback function for converting the input text to HTML output |
77 | 77 | function renderDynamicPageList( $input ) { |
78 | | - global $wgUser, $wgLang, $wgContLang; |
| 78 | + global $wgUser, $wgContLang; |
79 | 79 | global $wgDisableCounters; // to determine if to allow sorting by #hits. |
80 | 80 | global $wgDLPmaxCategories, $wgDLPMaxResultCount; |
81 | 81 | global $wgDLPAllowUnlimitedResults, $wgDLPAllowUnlimitedCategories; |
— | — | @@ -393,7 +393,7 @@ |
394 | 394 | |
395 | 395 | if ( $catCount < 1 && false == $namespaceFiltering ) { |
396 | 396 | if ( $suppressErrors == false ) { |
397 | | - return htmlspecialchars( wfMsg( 'intersection_noincludecats' ) ); // "!!no included categories!!"; |
| 397 | + return htmlspecialchars( wfMsgForContent( 'intersection_noincludecats' ) ); // "!!no included categories!!"; |
398 | 398 | } else { |
399 | 399 | return ''; |
400 | 400 | } |
— | — | @@ -401,7 +401,7 @@ |
402 | 402 | |
403 | 403 | if ( $totalCatCount > $wgDLPmaxCategories && !$wgDLPAllowUnlimitedCategories ) { |
404 | 404 | if ( $suppressErrors == false ) { |
405 | | - return htmlspecialchars( wfMsg( 'intersection_toomanycats' ) ); // "!!too many categories!!"; |
| 405 | + return htmlspecialchars( wfMsgForContent( 'intersection_toomanycats' ) ); // "!!too many categories!!"; |
406 | 406 | } else { |
407 | 407 | return ''; |
408 | 408 | } |
— | — | @@ -554,7 +554,7 @@ |
555 | 555 | |
556 | 556 | if ( $dbr->numRows( $res ) == 0 ) { |
557 | 557 | if ( $suppressErrors == false ) { |
558 | | - return htmlspecialchars( wfMsg( 'intersection_noresults' ) ); |
| 558 | + return htmlspecialchars( wfMsgForContent( 'intersection_noresults' ) ); |
559 | 559 | } else { |
560 | 560 | return ''; |
561 | 561 | } |
— | — | @@ -588,10 +588,10 @@ |
589 | 589 | } |
590 | 590 | $categoryDate = $df->reformat( $dateFormat, $categoryDate, array( 'match-whole' ) ); |
591 | 591 | } else { |
592 | | - $categoryDate = $wgLang->date( wfTimestamp( TS_MW, $row->cl_timestamp ) ); |
| 592 | + $categoryDate = $wgContLang->date( wfTimestamp( TS_MW, $row->cl_timestamp ) ); |
593 | 593 | } |
594 | 594 | if ( !$useGallery ) { |
595 | | - $categoryDate .= wfMsg( 'colon-separator' ); |
| 595 | + $categoryDate .= wfMsgForContent( 'colon-separator' ); |
596 | 596 | } else { |
597 | 597 | $categoryDate .= ' '; |
598 | 598 | } |