r54493 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r54492‎ | r54493 | r54494 >
Date:22:44, 5 August 2009
Author:brion
Status:ok
Tags:
Comment:
Merge fatal error fix from trunk r52879
Modified paths:
  • /branches/wmf-deployment/includes/Skin.php (modified) (history)

Diff [purge]

Index: branches/wmf-deployment/includes/Skin.php
@@ -1439,7 +1439,8 @@
14401440 return $out;
14411441 }
14421442 // Allow for site and per-namespace customization of copyright notice.
1443 - wfRunHooks( 'SkinCopyrightFooter', array( $wgArticle->getTitle(), $type, &$msg, &$link ) );
 1443+ if( isset($wgArticle) )
 1444+ wfRunHooks( 'SkinCopyrightFooter', array( $wgArticle->getTitle(), $type, &$msg, &$link ) );
14441445
14451446 $out .= wfMsgForContent( $msg, $link );
14461447 return $out;
Property changes on: branches/wmf-deployment/includes/Skin.php
___________________________________________________________________
Name: svn:mergeinfo
14471448 - /branches/REL1_15/phase3/includes/Skin.php:51646
/trunk/phase3/includes/Skin.php:52089-52361,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,53502-53504,53506,54384
14481449 + /branches/REL1_15/phase3/includes/Skin.php:51646
/trunk/phase3/includes/Skin.php:52089-52361,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52879,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53369,53502-53504,53506,54384

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r52879Fixed fatal error breakage (bug 19562)aaron00:35, 8 July 2009

Status & tagging log