| Index: trunk/extensions/SemanticMediaWiki/includes/queryprinters/SMW_QP_List.php |
| — | — | @@ -111,42 +111,10 @@ |
| 112 | 112 | if ( $this->mOutroTemplate != '' ) { |
| 113 | 113 | $result .= "{{" . $this->mOutroTemplate . "}}"; |
| 114 | 114 | } |
| 115 | | - |
| | 115 | + |
| 116 | 116 | // Make label for finding further results |
| 117 | 117 | if ( $this->linkFurtherResults( $res ) && ( ( $this->mFormat != 'ol' ) || ( $this->getSearchLabel( SMW_OUTPUT_WIKI ) ) ) ) { |
| 118 | | - $link = $res->getQueryLink(); |
| 119 | | - if ( $this->getSearchLabel( SMW_OUTPUT_WIKI ) ) { |
| 120 | | - $link->setCaption( $this->getSearchLabel( SMW_OUTPUT_WIKI ) ); |
| 121 | | - } |
| 122 | | - if ( $this->mSep != '' ) { |
| 123 | | - $link->setParameter( $this->mSep, 'sep' ); |
| 124 | | - } |
| 125 | | - $link->setParameter( $this->mFormat, 'format' ); |
| 126 | | - if ( $this->mTemplate != '' ) { |
| 127 | | - $link->setParameter( $this->mTemplate, 'template' ); |
| 128 | | - if ( array_key_exists( 'link', $this->m_params ) ) { // linking may interfere with templates |
| 129 | | - $link->setParameter( $this->m_params['link'], 'link' ); |
| 130 | | - } |
| 131 | | - } |
| 132 | | - if ( $this->mUserParam != '' ) { |
| 133 | | - $link->setParameter( $this->mUserParam, 'userparam' ); |
| 134 | | - } |
| 135 | | - if ( $this->mColumns != '' ) { |
| 136 | | - $link->setParameter( $this->mColumns, 'columns' ); |
| 137 | | - } |
| 138 | | - if ( $this->mIntro != '' ) { |
| 139 | | - $link->setParameter( $this->mIntro, 'intro' ); |
| 140 | | - } |
| 141 | | - if ( $this->mOutro != '' ) { |
| 142 | | - $link->setParameter( $this->mOutro, 'outro' ); |
| 143 | | - } |
| 144 | | - if ( $this->mIntroTemplate != '' ) { |
| 145 | | - $link->setParameter( $this->mIntroTemplate, 'introtemplate' ); |
| 146 | | - } |
| 147 | | - if ( $this->mOutroTemplate != '' ) { |
| 148 | | - $link->setParameter( $this->mOutroTemplate, 'outrotemplate' ); |
| 149 | | - } |
| 150 | | - $result .= $rowstart . $link->getText( SMW_OUTPUT_WIKI, $this->mLinker ) . $rowend . "\n"; |
| | 118 | + $this->showFurtherResults( $result, $res, $rowstart, $rowend ); |
| 151 | 119 | } |
| 152 | 120 | |
| 153 | 121 | if ( $this->mColumns > 1 ) { |
| — | — | @@ -238,6 +206,53 @@ |
| 239 | 207 | |
| 240 | 208 | $result .= $rowend; |
| 241 | 209 | } |
| | 210 | + |
| | 211 | + protected function showFurtherResults( &$result, $res, $rowstart, $rowend ) { |
| | 212 | + $link = $res->getQueryLink(); |
| | 213 | + |
| | 214 | + if ( $this->getSearchLabel( SMW_OUTPUT_WIKI ) ) { |
| | 215 | + $link->setCaption( $this->getSearchLabel( SMW_OUTPUT_WIKI ) ); |
| | 216 | + } |
| | 217 | + |
| | 218 | + if ( $this->mSep != '' ) { |
| | 219 | + $link->setParameter( $this->mSep, 'sep' ); |
| | 220 | + } |
| | 221 | + |
| | 222 | + $link->setParameter( $this->mFormat, 'format' ); |
| | 223 | + |
| | 224 | + if ( $this->mTemplate != '' ) { |
| | 225 | + $link->setParameter( $this->mTemplate, 'template' ); |
| | 226 | + if ( array_key_exists( 'link', $this->m_params ) ) { // linking may interfere with templates |
| | 227 | + $link->setParameter( $this->m_params['link'], 'link' ); |
| | 228 | + } |
| | 229 | + } |
| | 230 | + |
| | 231 | + if ( $this->mUserParam != '' ) { |
| | 232 | + $link->setParameter( $this->mUserParam, 'userparam' ); |
| | 233 | + } |
| | 234 | + |
| | 235 | + if ( $this->mColumns != '' ) { |
| | 236 | + $link->setParameter( $this->mColumns, 'columns' ); |
| | 237 | + } |
| | 238 | + |
| | 239 | + if ( $this->mIntro != '' ) { |
| | 240 | + $link->setParameter( $this->mIntro, 'intro' ); |
| | 241 | + } |
| | 242 | + |
| | 243 | + if ( $this->mOutro != '' ) { |
| | 244 | + $link->setParameter( $this->mOutro, 'outro' ); |
| | 245 | + } |
| | 246 | + |
| | 247 | + if ( $this->mIntroTemplate != '' ) { |
| | 248 | + $link->setParameter( $this->mIntroTemplate, 'introtemplate' ); |
| | 249 | + } |
| | 250 | + |
| | 251 | + if ( $this->mOutroTemplate != '' ) { |
| | 252 | + $link->setParameter( $this->mOutroTemplate, 'outrotemplate' ); |
| | 253 | + } |
| | 254 | + |
| | 255 | + $result .= $rowstart . $link->getText( SMW_OUTPUT_WIKI, $this->mLinker ) . $rowend . "\n"; |
| | 256 | + } |
| 242 | 257 | |
| 243 | 258 | public function getParameters() { |
| 244 | 259 | $params = parent::getParameters(); |