| Index: trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php |
| — | — | @@ -19,9 +19,6 @@ |
| 20 | 20 | protected $m_printouts = array(); |
| 21 | 21 | protected $m_editquery = false; |
| 22 | 22 | |
| 23 | | - // MW 1.13 compatibilty |
| 24 | | - protected static $pipeseparator = '|'; |
| 25 | | - |
| 26 | 23 | /** |
| 27 | 24 | * Constructor |
| 28 | 25 | */ |
| — | — | @@ -41,10 +38,6 @@ |
| 42 | 39 | $this->setHeaders(); |
| 43 | 40 | wfProfileIn( 'doSpecialAsk (SMW)' ); |
| 44 | 41 | |
| 45 | | - if ( $smwgMW_1_14 ) { // since MW 1.14.0 this is governed by a message |
| 46 | | - SMWAskPage::$pipeseparator = wfMsgExt( 'pipe-separator' , 'escapenoentities' ); |
| 47 | | - } |
| 48 | | - |
| 49 | 42 | if ( !$smwgQEnabled ) { |
| 50 | 43 | $wgOut->addHTML( '<br />' . wfMsg( 'smw_iq_disabled' ) ); |
| 51 | 44 | } else { |
| — | — | @@ -588,19 +581,17 @@ |
| 589 | 582 | $result .= '<br /><input type="submit" value="' . wfMsg( 'smw_ask_submit' ) . '"/>' . |
| 590 | 583 | '<input type="hidden" name="eq" value="yes"/>' . |
| 591 | 584 | ' <a href="' . htmlspecialchars( $skin->makeSpecialUrl( 'Ask', $urltail ) ) . '" rel="nofollow">' . wfMsg( 'smw_ask_hidequery' ) . '</a> ' . |
| 592 | | - SMWAskPage::$pipeseparator . ' ' . SMWAskPage::getEmbedToggle() . |
| 593 | | - SMWAskPage::$pipeseparator . |
| 594 | | - ' <a href="' . htmlspecialchars( wfMsg( 'smw_ask_doculink' ) ) . '">' . wfMsg( 'smw_ask_help' ) . '</a>' . |
| | 585 | + '| ' . SMWAskPage::getEmbedToggle() . |
| | 586 | + '| <a href="' . htmlspecialchars( wfMsg( 'smw_ask_doculink' ) ) . '">' . wfMsg( 'smw_ask_help' ) . '</a>' . |
| 595 | 587 | "\n</form>"; |
| 596 | 588 | } else { // if $this->m_editquery == false |
| 597 | 589 | $urltail = str_replace( '&eq=no', '', $urltail ) . '&eq=yes'; |
| 598 | 590 | $result .= '<p><a href="' . htmlspecialchars( $skin->makeSpecialUrl( 'Ask', $urltail ) ) . '" rel="nofollow">' . wfMsg( 'smw_ask_editquery' ) . '</a> ' . |
| 599 | | - SMWAskPage::$pipeseparator . ' ' . SMWAskPage::getEmbedToggle() . '</p>'; |
| | 591 | + '| ' . SMWAskPage::getEmbedToggle() . '</p>'; |
| 600 | 592 | '<input type="hidden" name="eq" value="yes"/>' . |
| 601 | 593 | ' <a href="' . htmlspecialchars( $skin->makeSpecialUrl( 'Ask', $urltail ) ) . '" rel="nofollow">' . wfMsg( 'smw_ask_hidequery' ) . '</a> ' . |
| 602 | | - SMWAskPage::$pipeseparator . ' ' . SMWAskPage::getEmbedToggle() . |
| 603 | | - SMWAskPage::$pipeseparator . |
| 604 | | - ' <a href="' . htmlspecialchars( wfMsg( 'smw_ask_doculink' ) ) . '">' . wfMsg( 'smw_ask_help' ) . '</a>' . |
| | 594 | + '| ' . SMWAskPage::getEmbedToggle() . |
| | 595 | + '| <a href="' . htmlspecialchars( wfMsg( 'smw_ask_doculink' ) ) . '">' . wfMsg( 'smw_ask_help' ) . '</a>' . |
| 605 | 596 | "\n</form>"; |
| 606 | 597 | } |
| 607 | 598 | |
| — | — | @@ -678,7 +669,7 @@ |
| 679 | 670 | $navigation .= '        ('; |
| 680 | 671 | $first = false; |
| 681 | 672 | } else { |
| 682 | | - $navigation .= ' ' . SMWAskPage::$pipeseparator . ' '; |
| | 673 | + $navigation .= ' | '; |
| 683 | 674 | } |
| 684 | 675 | |
| 685 | 676 | if ( $limit != $l ) { |