From: Niklas Laxström <nikerabbit@users.mediawiki.org>
Date: Sat, 25 Dec 2010 12:24:18 +0000 (+0000)
Subject: Don't load the same accesskey message four times (in the worst case)
X-Git-Tag: 1.31.0-rc.0~33101
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=5b6beefd396e521a59949fb566de36e7ad8e610b;p=lhc%2Fweb%2Fwiklou.git

Don't load the same accesskey message four times (in the worst case)
---

diff --git a/includes/Linker.php b/includes/Linker.php
index 2d067402a9..fb1d7f16b2 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1674,10 +1674,16 @@ class Linker {
 	public function accesskey( $name ) {
 		wfProfileIn( __METHOD__ );
 
-		if ( wfEmptyMsg( "accesskey-$name" ) ) {
+		if ( isset( $this->accesskeycache[$name] ) ) {
+			return $this->accesskeycache[$name];
+		}
+
+		$message = wfMessage( "accesskey-$name" );
+
+		if ( !$message->exists() ) {
 			$accesskey = false;
 		} else {
-			$accesskey = wfMsg( "accesskey-$name" );
+			$accesskey = $message->plain();
 			if ( $accesskey === '' || $accesskey === '-' ) {
 				# FIXME: Per standard MW behavior, a value of '-' means to suppress the
 				# attribute, but this is broken for accesskey: that might be a useful
@@ -1687,7 +1693,7 @@ class Linker {
 		}
 
 		wfProfileOut( __METHOD__ );
-		return $accesskey;
+		return $this->accesskeycache[$name] = $accesskey;
 	}
 
 	/**