[MediaWiki-CVS] SVN: [74001] trunk/extensions/SemanticMediaWiki/specials/AskSpecial/ SMW_SpecialAsk.php

[jeroendedauw]

http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74001

Revision: 74001
Author:   jeroendedauw
Date:     2010-09-29 23:04:32 +0000 (Wed, 29 Sep 2010)

Log Message:
-----------
Removed code for compatibility with MW 1.13

Modified Paths:
--------------
    trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php

Modified: 
trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php   
2010-09-29 22:50:40 UTC (rev 74000)
+++ trunk/extensions/SemanticMediaWiki/specials/AskSpecial/SMW_SpecialAsk.php   
2010-09-29 23:04:32 UTC (rev 74001)
@@ -19,9 +19,6 @@
        protected $m_printouts = array();
        protected $m_editquery = false;
 
-       // MW 1.13 compatibilty
-       protected static $pipeseparator = '|';
-
        /**
         * Constructor
         */
@@ -41,10 +38,6 @@
                $this->setHeaders();
                wfProfileIn( 'doSpecialAsk (SMW)' );
                
-               if ( $smwgMW_1_14 ) { // since MW 1.14.0 this is governed by a 
message
-                       SMWAskPage::$pipeseparator = wfMsgExt( 'pipe-separator' 
, 'escapenoentities' );
-               }
-               
                if ( !$smwgQEnabled ) {
                        $wgOut->addHTML( '<br />' . wfMsg( 'smw_iq_disabled' ) 
);
                } else {
@@ -588,19 +581,17 @@
                        $result .= '<br /><input type="submit" value="' . 
wfMsg( 'smw_ask_submit' ) . '"/>' .
                                '<input type="hidden" name="eq" value="yes"/>' .
                                        ' <a href="' . htmlspecialchars( 
$skin->makeSpecialUrl( 'Ask', $urltail ) ) . '" rel="nofollow">' . wfMsg( 
'smw_ask_hidequery' ) . '</a> ' .
-                                       SMWAskPage::$pipeseparator . ' ' . 
SMWAskPage::getEmbedToggle() .
-                                       SMWAskPage::$pipeseparator .
-                                       ' <a href="' . htmlspecialchars( wfMsg( 
'smw_ask_doculink' ) ) . '">' . wfMsg( 'smw_ask_help' ) . '</a>' .
+                                       '| ' . SMWAskPage::getEmbedToggle() .
+                                       '| <a href="' . htmlspecialchars( 
wfMsg( 'smw_ask_doculink' ) ) . '">' . wfMsg( 'smw_ask_help' ) . '</a>' .
                                "\n</form>";
                } else { // if $this->m_editquery == false
                        $urltail = str_replace( '&eq=no', '', $urltail ) . 
'&eq=yes';
                        $result .= '<p><a href="' . htmlspecialchars( 
$skin->makeSpecialUrl( 'Ask', $urltail ) ) . '" rel="nofollow">' . wfMsg( 
'smw_ask_editquery' ) . '</a> ' .
-                               SMWAskPage::$pipeseparator . ' ' . 
SMWAskPage::getEmbedToggle() . '</p>';
+                               '| ' . SMWAskPage::getEmbedToggle() . '</p>';
                                '<input type="hidden" name="eq" value="yes"/>' .
                                        ' <a href="' . htmlspecialchars( 
$skin->makeSpecialUrl( 'Ask', $urltail ) ) . '" rel="nofollow">' . wfMsg( 
'smw_ask_hidequery' ) . '</a> ' .
-                                       SMWAskPage::$pipeseparator . ' ' . 
SMWAskPage::getEmbedToggle() .
-                                       SMWAskPage::$pipeseparator .
-                                       ' <a href="' . htmlspecialchars( wfMsg( 
'smw_ask_doculink' ) ) . '">' . wfMsg( 'smw_ask_help' ) . '</a>' .
+                                       '| ' . SMWAskPage::getEmbedToggle() .
+                                       '| <a href="' . htmlspecialchars( 
wfMsg( 'smw_ask_doculink' ) ) . '">' . wfMsg( 'smw_ask_help' ) . '</a>' .
                                "\n</form>";
                }
 
@@ -678,7 +669,7 @@
                                $navigation .= 
'&#160;&#160;&#160;&#160;&#160;&#160;&#160;&#160;(';
                                $first = false;
                        } else {
-                               $navigation .= ' ' . SMWAskPage::$pipeseparator 
. ' ';
+                               $navigation .= ' | ';
                        }
                        
                        if ( $limit != $l ) {



_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs