From a22fbfc60f36f5f7ee10d5ae6fe347340c2ee67c Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 3 Dec 2011 09:20:55 +0100
Subject: Update to MediaWiki 1.17.1

---
 includes/GlobalFunctions.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'includes/GlobalFunctions.php')

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index b21779c1..2c35568b 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1341,10 +1341,11 @@ function wfTime() {
 /**
  * Sets dest to source and returns the original value of dest
  * If source is NULL, it just returns the value, it doesn't set the variable
+ * If force is true, it will set the value even if source is NULL
  */
-function wfSetVar( &$dest, $source ) {
+function wfSetVar( &$dest, $source, $force = false ) {
 	$temp = $dest;
-	if ( !is_null( $source ) ) {
+	if ( !is_null( $source ) || $force ) {
 		$dest = $source;
 	}
 	return $temp;
-- 
cgit v1.2.2