| Index: trunk/extensions/SphinxSearch/SphinxSearch_body.php |
| — | — | @@ -124,6 +124,12 @@ |
| 125 | 125 | return $categories; |
| 126 | 126 | } |
| 127 | 127 | |
| | 128 | + /** |
| | 129 | + * $wgAjaxExportList callback - create a category filter sub-menu |
| | 130 | + * |
| | 131 | + * @param string $parent_id |
| | 132 | + * @return string |
| | 133 | + */ |
| 128 | 134 | function ajaxGetCategoryChildren( $parent_id ) { |
| 129 | 135 | |
| 130 | 136 | $title = Title::newFromID( $parent_id ); |
| — | — | @@ -159,6 +165,11 @@ |
| 160 | 166 | return $response; |
| 161 | 167 | } |
| 162 | 168 | |
| | 169 | + /** |
| | 170 | + * Main execution function |
| | 171 | + * |
| | 172 | + * @param string $par Parameters passed to the page |
| | 173 | + */ |
| 163 | 174 | function execute( $par ) { |
| 164 | 175 | global $wgRequest, $wgOut, $wgUser, $wgSphinxMatchAll, $wgSphinxSearch_index_list; |
| 165 | 176 | |
| — | — | @@ -226,6 +237,11 @@ |
| 227 | 238 | $this->createNewSearchForm( $term ); |
| 228 | 239 | } |
| 229 | 240 | |
| | 241 | + /** |
| | 242 | + * If an exact title match can be found, jump straight ahead to it. |
| | 243 | + * |
| | 244 | + * @param string $term |
| | 245 | + */ |
| 230 | 246 | function goResult( $term ) { |
| 231 | 247 | global $wgOut, $wgGoToEdit; |
| 232 | 248 | |
| — | — | @@ -387,9 +403,6 @@ |
| 388 | 404 | $cl->SetFilter( 'category', $this->exc_categories, true ); |
| 389 | 405 | } |
| 390 | 406 | |
| 391 | | - if ( isset( $wgSphinxSearch_groupby ) && isset( $wgSphinxSearch_groupsort ) ) { |
| 392 | | - $cl->SetGroupBy( $wgSphinxSearch_groupby, SPH_GROUPBY_ATTR, $wgSphinxSearch_groupsort ); |
| 393 | | - } |
| 394 | 407 | $cl->SetSortMode( $wgSphinxSearch_sortmode, $wgSphinxSearch_sortby ); |
| 395 | 408 | $cl->SetLimits( |
| 396 | 409 | ( $this->page - 1 ) * $wgSphinxSearch_matches, |
| Index: trunk/extensions/SphinxSearch/SphinxSearch.php |
| — | — | @@ -11,7 +11,7 @@ |
| 12 | 12 | |
| 13 | 13 | $wgExtensionCredits['specialpage'][] = array( |
| 14 | 14 | 'path' => __FILE__, |
| 15 | | - 'version' => '0.7.0', |
| | 15 | + 'version' => '0.7.1', |
| 16 | 16 | 'name' => 'SphinxSearch', |
| 17 | 17 | 'author' => array( 'Svemir Brkic', 'Paul Grinberg' ), |
| 18 | 18 | 'email' => 'svemir at deveblog dot com, gri6507 at yahoo dot com', |