[MediaWiki-CVS] SVN: [89428] trunk/extensions/SemanticMediaWiki/includes/articlepages

[jeroendedauw]

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

Revision: 89428
Author:   jeroendedauw
Date:     2011-06-03 17:43:09 +0000 (Fri, 03 Jun 2011)
Log Message:
-----------
replace skin by linker

Modified Paths:
--------------
    
trunk/extensions/SemanticMediaWiki/includes/articlepages/SMW_OrderedListPage.php
    
trunk/extensions/SemanticMediaWiki/includes/articlepages/SMW_PropertyPage.php

Modified: 
trunk/extensions/SemanticMediaWiki/includes/articlepages/SMW_OrderedListPage.php
===================================================================
--- 
trunk/extensions/SemanticMediaWiki/includes/articlepages/SMW_OrderedListPage.php
    2011-06-03 17:10:08 UTC (rev 89427)
+++ 
trunk/extensions/SemanticMediaWiki/includes/articlepages/SMW_OrderedListPage.php
    2011-06-03 17:43:09 UTC (rev 89428)
@@ -106,19 +106,6 @@
        protected abstract function getHtml();
 
        /**
-        * Fetch and return the relevant skin object.
-        * 
-        * @return Skin
-        */
-       protected function getSkin() {
-               global $wgUser;
-               if ( !$this->skin ) {
-                       $this->skin = $wgUser->getSkin();
-               }
-               return $this->skin;
-       }
-
-       /**
         * Like Article's getTitle(), but returning a suitable SMWDIWikiPage.
         * 
         * @return SMWDIWikiPage

Modified: 
trunk/extensions/SemanticMediaWiki/includes/articlepages/SMW_PropertyPage.php
===================================================================
--- 
trunk/extensions/SemanticMediaWiki/includes/articlepages/SMW_PropertyPage.php   
    2011-06-03 17:10:08 UTC (rev 89427)
+++ 
trunk/extensions/SemanticMediaWiki/includes/articlepages/SMW_PropertyPage.php   
    2011-06-03 17:43:09 UTC (rev 89428)
@@ -158,8 +158,8 @@
 
                        // Property name
                        $searchlink = SMWInfolink::newBrowsingLink( '+', 
$dvWikiPage->getShortHTMLText() );
-                       $r .= '<tr><td class="smwpropname">' . 
$dvWikiPage->getLongHTMLText( $this->getSkin() ) .
-                             '&#160;' . $searchlink->getHTML( $this->getSkin() 
) . '</td><td class="smwprops">';
+                       $r .= '<tr><td class="smwpropname">' . 
$dvWikiPage->getLongHTMLText( smwfGetLinker() ) .
+                             '&#160;' . $searchlink->getHTML( smwfGetLinker() 
) . '</td><td class="smwprops">';
                        
                        // Property values
                        $ropts = new SMWRequestOptions();
@@ -175,10 +175,10 @@
 
                                if ( $i < $smwgMaxPropertyValues + 1 ) {
                                        $dv = 
SMWDataValueFactory::newDataItemValue( $di, $this->mProperty );
-                                       $r .= $dv->getLongHTMLText( 
$this->getSkin() ) . $dv->getInfolinkText( SMW_OUTPUT_HTML, $this->getSkin() );
+                                       $r .= $dv->getLongHTMLText( 
smwfGetLinker() ) . $dv->getInfolinkText( SMW_OUTPUT_HTML, smwfGetLinker() );
                                } else {
                                        $searchlink = 
SMWInfolink::newInversePropertySearchLink( '…', $dvWikiPage->getWikiValue(), 
$this->mTitle->getText() );
-                                       $r .= $searchlink->getHTML( 
$this->getSkin() );
+                                       $r .= $searchlink->getHTML( 
smwfGetLinker() );
                                }
                        }
 


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