http://www.mediawiki.org/wiki/Special:Code/MediaWiki/54496
Revision: 54496
Author: brion
Date: 2009-08-05 22:50:03 +0000 (Wed, 05 Aug 2009)
Log Message:
-----------
Merge fatal fix from r54125
Modified Paths:
--------------
branches/wmf-deployment/extensions/MWSearch/MWSearch_body.php
Property Changed:
----------------
branches/wmf-deployment/extensions/MWSearch/
branches/wmf-deployment/extensions/MWSearch/MWSearch_body.php
Property changes on: branches/wmf-deployment/extensions/MWSearch
___________________________________________________________________
Added: svn:mergeinfo
+ /branches/REL1_15/phase3/extensions/MWSearch:51646
/trunk/extensions/MWSearch:52859,52871-52872,52876,53191,53205-53206,53272,54125
/trunk/phase3/MWSearch:52859,53272
/trunk/phase3/extensions/MWSearch:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,54384
Modified: branches/wmf-deployment/extensions/MWSearch/MWSearch_body.php
===================================================================
--- branches/wmf-deployment/extensions/MWSearch/MWSearch_body.php
2009-08-05 22:46:23 UTC (rev 54495)
+++ branches/wmf-deployment/extensions/MWSearch/MWSearch_body.php
2009-08-05 22:50:03 UTC (rev 54496)
@@ -30,10 +30,11 @@
static function prefixSearch( $ns, $search, $limit, &$results ) {
$it = LuceneSearchSet::newFromQuery( 'prefix', $search, $ns,
$limit, 0 );
$results = array();
- while( $res = $it->next() ) {
- $results[] = $res->getTitle()->getPrefixedText();
+ if( $it ) { // $it can be null
+ while( $res = $it->next() ) {
+ $results[] =
$res->getTitle()->getPrefixedText();
+ }
}
-
return false;
}
Property changes on:
branches/wmf-deployment/extensions/MWSearch/MWSearch_body.php
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/REL1_15/phase3/extensions/MWSearch/MWSearch_body.php:51646
/trunk/extensions/MWSearch/MWSearch_body.php:52089-52665,52859,52871-52872,52876,53191,53205-53206,53272
+ /branches/REL1_15/phase3/extensions/MWSearch/MWSearch_body.php:51646
/trunk/extensions/MWSearch/MWSearch_body.php:52089-52665,52859,52871-52872,52876,53191,53205-53206,53272,54125
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
