Index: trunk/phase3/includes/api/ApiQuerySearch.php |
— | — | @@ -71,14 +71,17 @@ |
72 | 72 | // of the way we initially set up the MySQL fulltext-based |
73 | 73 | // search engine with separate title and text fields. |
74 | 74 | // In the future, the default should be for a combined index. |
| 75 | + $what = 'title'; |
75 | 76 | $matches = $search->searchTitle( $query ); |
76 | 77 | |
77 | 78 | // Not all search engines support a separate title search, |
78 | 79 | // for instance the Lucene-based engine we use on Wikipedia. |
79 | 80 | // In this case, fall back to full-text search (which will |
80 | 81 | // include titles in it!) |
81 | | - if( is_null( $matches ) ) |
| 82 | + if( is_null( $matches ) ) { |
| 83 | + $what = 'text'; |
82 | 84 | $matches = $search->searchText( $query ); |
| 85 | + } |
83 | 86 | } |
84 | 87 | if (is_null($matches)) |
85 | 88 | $this->dieUsage("{$what} search is disabled", |
Index: trunk/phase3/RELEASE-NOTES |
— | — | @@ -488,6 +488,7 @@ |
489 | 489 | instead of spaces |
490 | 490 | * (bug 16516) Made rvsection=T-2 work |
491 | 491 | * (bug 16526) Added usprop=canemail to list=users |
| 492 | +* (bug 16548) list=search threw errors with an invalid error code |
492 | 493 | |
493 | 494 | === Languages updated in 1.14 === |
494 | 495 | |