r79354 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r79353‎ | r79354 | r79355 >
Date:17:07, 31 December 2010
Author:catrope
Status:deferred
Tags:
Comment:
1.16wmf4: Merge r79351 from the 1.17 branch, fixes fatal in Special:LinkSearch
Modified paths:
  • /branches/wmf/1.16wmf4/includes/specials/SpecialLinkSearch.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.16wmf4/includes/specials/SpecialLinkSearch.php
@@ -98,6 +98,7 @@
9999 if ($rv === false) {
100100 //makeLike doesn't handle wildcard in IP, so we'll have to munge here.
101101 if (preg_match('/^(:?[0-9]{1,3}\.)+\*\s*$|^(:?[0-9]{1,3}\.){3}[0-9]{1,3}:[0-9]*\*\s*$/', $query)) {
 102+ $dbr = wfGetDB( DB_SLAVE );
102103 $rv = array( $prot . rtrim($query, " \t*"), $dbr->anyString() );
103104 $field = 'el_to';
104105 }
Property changes on: branches/wmf/1.16wmf4/includes/specials/SpecialLinkSearch.php
___________________________________________________________________
Added: svn:mergeinfo
105106 Merged /branches/REL1_15/phase3/includes/specials/SpecialLinkSearch.php:r51646
106107 Merged /branches/REL1_17/phase3/includes/specials/SpecialLinkSearch.php:r79351
107108 Merged /branches/sqlite/includes/specials/SpecialLinkSearch.php:r58211-58321
108109 Merged /trunk/phase3/includes/specials/SpecialLinkSearch.php:r63045,63047,63549,63764,63897-63901,64846,64860,64862,71059,71098,77555,77558-77560,77563-77565,77573
109110 Merged /branches/wmf-deployment/includes/specials/SpecialLinkSearch.php:r53381,56967,60970

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r793511.17: Fix fatal error due to undefined $dbr introduced in r57989. This was fi...catrope16:56, 31 December 2010

Status & tagging log