r97583 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r97582‎ | r97583 | r97584 >
Date:00:11, 20 September 2011
Author:reedy
Status:ok (Comments)
Tags:
Comment:
<preilly> PHP fatal error in /usr/local/apache/common-local/php-1.18/extensions/TitleBlacklist/TitleBlacklist.list.php line 326:

Fixed in 1.18wmf1 and trunk
Modified paths:
  • /branches/wmf/1.18wmf1/extensions/TitleBlacklist/TitleBlacklist.list.php (modified) (history)
  • /trunk/extensions/TitleBlacklist/TitleBlacklist.list.php (modified) (history)

Diff [purge]

Index: trunk/extensions/TitleBlacklist/TitleBlacklist.list.php
@@ -325,6 +325,9 @@
326326 * else false if it doesn't match (or was overridden)
327327 */
328328 public function matches( $title, $action ) {
 329+ if ( !$title ) {
 330+ return false;
 331+ }
329332 wfSuppressWarnings();
330333 $match = preg_match( "/^(?:{$this->mRegex})$/us" . ( isset( $this->mParams['casesensitive'] ) ? '' : 'i' ), $title->getFullText() );
331334 wfRestoreWarnings();
Index: branches/wmf/1.18wmf1/extensions/TitleBlacklist/TitleBlacklist.list.php
@@ -322,6 +322,9 @@
323323 * else false if it doesn't match (or was overridden)
324324 */
325325 public function matches( $title, $action ) {
 326+ if ( !$title ) {
 327+ return false;
 328+ }
326329 wfSuppressWarnings();
327330 $match = preg_match( "/^(?:{$this->mRegex})$/us" . ( isset( $this->mParams['casesensitive'] ) ? '' : 'i' ), $title->getFullText() );
328331 wfRestoreWarnings();

Follow-up revisions

RevisionCommit summaryAuthorDate
r97612REL1_18: MFT r97590, r97583reedy10:04, 20 September 2011

Comments

#Comment by G.Hagedorn (talk | contribs)   18:21, 20 September 2011

Please tag for 1.18 as well

#Comment by Reedy (talk | contribs)   18:22, 20 September 2011

No need, already merged to 1.18 in r97612

#Comment by Catrope (talk | contribs)   18:23, 20 September 2011

Already merged in r97612

#Comment by G.Hagedorn (talk | contribs)   18:37, 20 September 2011

Apologies, I see it now. I am still learning.

Status & tagging log