From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Fri, 18 Mar 2011 22:03:31 +0000 (+0000)
Subject: Follow-ups to r84258.
X-Git-Tag: 1.31.0-rc.0~31336
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=f8ab1088c28ada9a306c17ece6bfa236d7f2e6f2;p=lhc%2Fweb%2Fwiklou.git

Follow-ups to r84258.
---

diff --git a/languages/Language.php b/languages/Language.php
index 504f8826e3..ae8f07eb7c 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -2979,16 +2979,16 @@ class Language {
 	 * @return String
 	 */
 	public function formatExpiry( $expiry, $format = true ) {
-		static $dbr, $msg;
-		if( !$dbr ){
-			$dbr = wfGetDB( DB_SLAVE );
-			$msg = wfMessage( 'infiniteblock' );
+		static $infinity, $infinityMsg;
+		if( $infinity === null ){
+			$infinityMsg = wfMessage( 'infiniteblock' );
+			$infinity = wfGetDB( DB_SLAVE )->getInfinity();
 		}
 
-		if ( $expiry == '' || $expiry == $dbr->getInfinity() ) {
+		if ( $expiry == '' || $expiry == $infinity ) {
 			return $format === true
-				? $msg
-				: $dbr->getInfinity();
+				? $infinityMsg
+				: $infinity;
 		} else {
 			return $format === true
 				? $this->timeanddate( $expiry )