http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72962
Revision: 72962
Author: nikerabbit
Date: 2010-09-14 09:27:31 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
Ditch cdb wrapper for message index, it's useless
Modified Paths:
--------------
trunk/extensions/Translate/TranslateUtils.php
trunk/extensions/Translate/utils/MessageIndexRebuilder.php
Modified: trunk/extensions/Translate/TranslateUtils.php
===================================================================
--- trunk/extensions/Translate/TranslateUtils.php 2010-09-14 09:23:43 UTC
(rev 72961)
+++ trunk/extensions/Translate/TranslateUtils.php 2010-09-14 09:27:31 UTC
(rev 72962)
@@ -304,18 +304,17 @@
* @return \array or \type{false}
*/
public static function messageIndex() {
- $filename = self::cacheFile( 'translate_messageindex.cdb' );
+ wfDebug( __METHOD__ . ": loading from file...\n" );
+ $filename = self::cacheFile( 'translate_messageindex.ser' );
if ( !file_exists( $filename ) ) {
MessageIndexRebuilder::execute();
}
if ( file_exists( $filename ) ) {
- $reader = CdbReader::open( $filename );
- $keyToGroup = unserialize( $reader->get( 'map' ) );
+ $keyToGroup = unserialize( file_get_contents( $filename
) );
} else {
- $keyToGroup = false;
- wfDebug( __METHOD__ . ": Message index missing." );
+ throw new MWException( 'Unable to get message index' );
}
self::$mi = $keyToGroup;
Modified: trunk/extensions/Translate/utils/MessageIndexRebuilder.php
===================================================================
--- trunk/extensions/Translate/utils/MessageIndexRebuilder.php 2010-09-14
09:23:43 UTC (rev 72961)
+++ trunk/extensions/Translate/utils/MessageIndexRebuilder.php 2010-09-14
09:27:31 UTC (rev 72962)
@@ -41,11 +41,8 @@
self::checkAndAdd( $hugearray, $g, true );
}
- $filename = TranslateUtils::cacheFile(
'translate_messageindex.cdb' );
-
- $writer = CdbWriter::open( $filename );
- $writer->set( 'map', serialize( $hugearray ) );
- $writer->close();
+ $filename = TranslateUtils::cacheFile(
'translate_messageindex.ser' );
+ file_put_contents( $filename, serialize( $hugearray ) );
}
protected static function checkAndAdd( &$hugearray, $g, $ignore = false
) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
