From e04afc0bd0498e2df021bdb4288a8c6ee82bd4b3 Mon Sep 17 00:00:00 2001 From: Jeroen De Dauw Date: Tue, 13 Dec 2011 16:42:56 +0000 Subject: [PATCH] Follow up to r106037; fix location of check --- includes/GlobalFunctions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 5fdcf2a011..ce60d594c2 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -3460,10 +3460,10 @@ function wfDeprecated( $function, $version = false, $component = false ) { if ( !isset( $functionsWarned[$function] ) ) { $functionsWarned[$function] = true; - if ( $version && $component === false ) { + if ( $version ) { global $wgDeprecationReleaseLimit; - if ( $wgDeprecationReleaseLimit ) { + if ( $wgDeprecationReleaseLimit && $component === false ) { # Strip -* off the end of $version so that branches can use the # format #.##-branchname to avoid issues if the branch is merged into # a version of MediaWiki later than what it was branched from -- 2.20.1