| Index: trunk/extensions/SemanticCompoundQueries/SCQ_QueryProcessor.php |
| — | — | @@ -158,28 +158,11 @@ |
| 159 | 159 | |
| 160 | 160 | $query = self::createQuery( $querystring, $params, $context, null, $extraprintouts ); |
| 161 | 161 | $query_result = smwfGetStore()->getQueryResult( $query ); |
| 162 | | - $display_options = array(); |
| 163 | | - |
| 164 | | - foreach ( $params as $key => $value ) { |
| 165 | | - // Special handling for 'icon' field, since it requires conversion of a name to a URL. |
| 166 | | - if ( $key == 'icon' ) { |
| 167 | | - $title = Title::newFromText( $value, NS_FILE ); |
| 168 | | - |
| 169 | | - if ( !is_null( $title ) && $title->getNamespace() == NS_FILE && $title->exists() ) { |
| 170 | | - $icon_image_page = new ImagePage( $title ); |
| 171 | | - $display_options['icon'] = $icon_image_page->getDisplayedFile()->getURL(); |
| 172 | | - } |
| 173 | | - } else { |
| 174 | | - $display_options[$key] = $value; |
| 175 | | - } |
| 176 | | - |
| 177 | | - foreach ( $query_result->getResults() as $wiki_page ) { |
| 178 | | - $wiki_page->display_options = $display_options; |
| 179 | | - } |
| | 162 | + foreach ( $query_result->getResults() as $wiki_page ) { |
| | 163 | + $wiki_page->display_options = $params; |
| 180 | 164 | } |
| 181 | 165 | |
| 182 | 166 | wfProfileOut( 'SCQQueryProcessor::getQueryResultFromQueryString' ); |
| 183 | | - |
| 184 | 167 | return $query_result; |
| 185 | 168 | } |
| 186 | 169 | |