http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95760
Revision: 95760
Author: nikerabbit
Date: 2011-08-30 12:05:03 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
Simplify, use strict comparison
Modified Paths:
--------------
trunk/extensions/Translate/TranslateUtils.php
Modified: trunk/extensions/Translate/TranslateUtils.php
===================================================================
--- trunk/extensions/Translate/TranslateUtils.php 2011-08-30 11:56:22 UTC
(rev 95759)
+++ trunk/extensions/Translate/TranslateUtils.php 2011-08-30 12:05:03 UTC
(rev 95760)
@@ -161,7 +161,7 @@
foreach ( $items as $item ) {
$item = strval( $item );
- $options[] = Xml::option( $item, $item, $item ==
$selected );
+ $options[] = Xml::option( $item, $item, $item ===
$selected );
}
return self::selector( $name, implode( "\n", $options ) );
@@ -243,21 +243,8 @@
* @return \types{\string,\null} Group id or null.
*/
public static function messageKeyToGroup( $namespace, $key ) {
- if ( self::$mi === null ) {
- self::messageIndex();
- }
-
- // Performance hotspot.
- # $normkey = self::normaliseKey( $namespace, $key );
- $normkey = str_replace( " ", "_", strtolower( "$namespace:$key"
) );
-
- $group = isset( self::$mi[$normkey] ) ? self::$mi[$normkey] :
null;
-
- if ( is_array( $group ) ) {
- $group = $group[0];
- }
-
- return $group;
+ $groups = self::messageKeyToGroups( $namespace, $key );
+ return count( $group ) ? $group[0] : null;
}
/**
@@ -271,9 +258,7 @@
self::messageIndex();
}
- // Performance hotspot.
- # $normkey = self::normaliseKey( $namespace, $key );
- $normkey = str_replace( " ", "_", strtolower( "$namespace:$key"
) );
+ $normkey = self::normaliseKey( $namespace, $key );
if ( isset( self::$mi[$normkey] ) ) {
return (array) self::$mi[$normkey];
@@ -289,7 +274,7 @@
* @return \string
*/
public static function normaliseKey( $namespace, $key ) {
- return str_replace( " ", "_", strtolower( "$namespace:$key" ) );
+ return strtr( strtolower( "$namespace:$key" ), " ", "_" );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
