Merge r82361 from 1.17wmf1 to trunk. This shuts up "Non-string key given" exceptions in cases where a numeric key manages to become an integer somehow. This could probably be fixed in a better way but I wouldn't know how.

1 files changed, 5 insertions, 0 deletions

diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index 69644792afdf..3f787e907f1b 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -584,6 +584,11 @@ class MessageCache {
 	function get( $key, $useDB = true, $langcode = true, $isFullKey = false ) {
 		global $wgLanguageCode, $wgContLang;
 
+		if ( is_int( $key ) ) {
+			// "Non-string key given" exception sometimes happens for numerical strings that become ints somewhere on their way here
+			$key = strval( $key );
+		}
+
 		if ( !is_string( $key ) ) {
 			throw new MWException( 'Non-string key given' );
 		}