| Index: branches/REL1_17/phase3/docs/hooks.txt |
| — | — | @@ -1597,13 +1597,13 @@ |
| 1598 | 1598 | &$query_options: array of options for the database request |
| 1599 | 1599 | &$select: String '*' or array of columns to select |
| 1600 | 1600 | |
| 1601 | | -'SpecialSearchGomatch': called when user clicked the "Go" button and the target |
| 1602 | | -exists |
| 1603 | | -&$title: title object generated from the text entred by the user |
| | 1601 | +'SpecialSearchGo': called when user clicked the "Go" |
| | 1602 | +&$title: title object generated from the text entered by the user |
| | 1603 | +&$term: the search term entered by the user |
| 1604 | 1604 | |
| 1605 | 1605 | 'SpecialSearchNogomatch': called when user clicked the "Go" button but the |
| 1606 | 1606 | target doesn't exist |
| 1607 | | -&$title: title object generated from the text entred by the user |
| | 1607 | +&$title: title object generated from the text entered by the user |
| 1608 | 1608 | |
| 1609 | 1609 | 'SpecialSearchProfiles': allows modification of search profiles |
| 1610 | 1610 | &$profiles: profiles, which can be modified. |
| Property changes on: branches/REL1_17/phase3/docs/hooks.txt |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 1611 | 1611 | Merged /branches/new-installer/phase3/docs/hooks.txt:r43664-66004 |
| 1612 | 1612 | Merged /branches/REL1_15/phase3/docs/hooks.txt:r51646 |
| 1613 | 1613 | Merged /branches/sqlite/docs/hooks.txt:r58211-58321 |
| 1614 | 1614 | Merged /trunk/phase3/docs/hooks.txt:r78262-78320 |
| Index: branches/REL1_17/phase3/includes/specials/SpecialSearch.php |
| — | — | @@ -91,8 +91,13 @@ |
| 92 | 92 | } |
| 93 | 93 | # If there's an exact or very near match, jump right there. |
| 94 | 94 | $t = SearchEngine::getNearMatch( $term ); |
| | 95 | + |
| | 96 | + if ( !wfRunHooks( 'SpecialSearchGo', array( &$t, &$term ) ) ) { |
| | 97 | + # Hook requested termination |
| | 98 | + return; |
| | 99 | + } |
| | 100 | + |
| 95 | 101 | if( !is_null( $t ) ) { |
| 96 | | - wfRunHooks( 'SpecialSearchGomatch', array( &$t ) ); |
| 97 | 102 | $wgOut->redirect( $t->getFullURL() ); |
| 98 | 103 | return; |
| 99 | 104 | } |
| Property changes on: branches/REL1_17/phase3/includes/specials/SpecialSearch.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 100 | 105 | Merged /branches/wmf-deployment/includes/specials/SpecialSearch.php:r53381,56967 |
| 101 | 106 | Merged /branches/REL1_15/phase3/includes/specials/SpecialSearch.php:r51646 |
| 102 | 107 | Merged /branches/sqlite/includes/specials/SpecialSearch.php:r58211-58321 |
| 103 | 108 | Merged /trunk/phase3/includes/specials/SpecialSearch.php:r78262-78320 |