| Index: trunk/extensions/SemanticMediaWiki/includes/articlepages/SMW_OrderedListPage.php |
| — | — | @@ -106,19 +106,6 @@ |
| 107 | 107 | protected abstract function getHtml(); |
| 108 | 108 | |
| 109 | 109 | /** |
| 110 | | - * Fetch and return the relevant skin object. |
| 111 | | - * |
| 112 | | - * @return Skin |
| 113 | | - */ |
| 114 | | - protected function getSkin() { |
| 115 | | - global $wgUser; |
| 116 | | - if ( !$this->skin ) { |
| 117 | | - $this->skin = $wgUser->getSkin(); |
| 118 | | - } |
| 119 | | - return $this->skin; |
| 120 | | - } |
| 121 | | - |
| 122 | | - /** |
| 123 | 110 | * Like Article's getTitle(), but returning a suitable SMWDIWikiPage. |
| 124 | 111 | * |
| 125 | 112 | * @return SMWDIWikiPage |
| Index: trunk/extensions/SemanticMediaWiki/includes/articlepages/SMW_PropertyPage.php |
| — | — | @@ -158,8 +158,8 @@ |
| 159 | 159 | |
| 160 | 160 | // Property name |
| 161 | 161 | $searchlink = SMWInfolink::newBrowsingLink( '+', $dvWikiPage->getShortHTMLText() ); |
| 162 | | - $r .= '<tr><td class="smwpropname">' . $dvWikiPage->getLongHTMLText( $this->getSkin() ) . |
| 163 | | - ' ' . $searchlink->getHTML( $this->getSkin() ) . '</td><td class="smwprops">'; |
| | 162 | + $r .= '<tr><td class="smwpropname">' . $dvWikiPage->getLongHTMLText( smwfGetLinker() ) . |
| | 163 | + ' ' . $searchlink->getHTML( smwfGetLinker() ) . '</td><td class="smwprops">'; |
| 164 | 164 | |
| 165 | 165 | // Property values |
| 166 | 166 | $ropts = new SMWRequestOptions(); |
| — | — | @@ -175,10 +175,10 @@ |
| 176 | 176 | |
| 177 | 177 | if ( $i < $smwgMaxPropertyValues + 1 ) { |
| 178 | 178 | $dv = SMWDataValueFactory::newDataItemValue( $di, $this->mProperty ); |
| 179 | | - $r .= $dv->getLongHTMLText( $this->getSkin() ) . $dv->getInfolinkText( SMW_OUTPUT_HTML, $this->getSkin() ); |
| | 179 | + $r .= $dv->getLongHTMLText( smwfGetLinker() ) . $dv->getInfolinkText( SMW_OUTPUT_HTML, smwfGetLinker() ); |
| 180 | 180 | } else { |
| 181 | 181 | $searchlink = SMWInfolink::newInversePropertySearchLink( '…', $dvWikiPage->getWikiValue(), $this->mTitle->getText() ); |
| 182 | | - $r .= $searchlink->getHTML( $this->getSkin() ); |
| | 182 | + $r .= $searchlink->getHTML( smwfGetLinker() ); |
| 183 | 183 | } |
| 184 | 184 | } |
| 185 | 185 | |