Index: trunk/phase3/includes/cache/MessageCache.php |
— | — | @@ -584,6 +584,11 @@ |
585 | 585 | function get( $key, $useDB = true, $langcode = true, $isFullKey = false ) { |
586 | 586 | global $wgLanguageCode, $wgContLang; |
587 | 587 | |
| 588 | + if ( is_int( $key ) ) { |
| 589 | + // "Non-string key given" exception sometimes happens for numerical strings that become ints somewhere on their way here |
| 590 | + $key = strval( $key ); |
| 591 | + } |
| 592 | + |
588 | 593 | if ( !is_string( $key ) ) { |
589 | 594 | throw new MWException( 'Non-string key given' ); |
590 | 595 | } |
Property changes on: trunk/phase3/includes/cache/MessageCache.php |
___________________________________________________________________ |
Added: svn:mergeinfo |
591 | 596 | Merged /branches/new-installer/phase3/includes/cache/MessageCache.php:r43664-66004 |
592 | 597 | Merged /branches/wmf/1.17wmf1/includes/MessageCache.php:r82361 |
593 | 598 | Merged /branches/wmf-deployment/includes/cache/MessageCache.php:r53381 |
594 | 599 | Merged /branches/REL1_15/phase3/includes/cache/MessageCache.php:r51646 |
595 | 600 | Merged /branches/sqlite/includes/cache/MessageCache.php:r58211-58321 |