r113411 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r113410‎ | r113411 | r113412 >
Date:22:08, 8 March 2012
Author:catrope
Status:ok
Tags:
Comment:
1.19wmf1: MFT r105964, r106137
Modified paths:
  • /branches/wmf/1.19wmf1/includes/Cdb.php (modified) (history)
  • /branches/wmf/1.19wmf1/includes/MagicWord.php (modified) (history)

Diff [purge]

Index: branches/wmf/1.19wmf1/includes/Cdb.php
@@ -19,12 +19,12 @@
2020 * @return CdbReader
2121 */
2222 public static function open( $fileName ) {
23 - if ( self::haveExtension() ) {
24 - return new CdbReader_DBA( $fileName );
25 - } else {
26 - wfDebug( "Warning: no dba extension found, using emulation.\n" );
 23+ //if ( self::haveExtension() ) {
 24+ // return new CdbReader_DBA( $fileName );
 25+ //} else {
 26+ // wfDebug( "Warning: no dba extension found, using emulation.\n" );
2727 return new CdbReader_PHP( $fileName );
28 - }
 28+ //}
2929 }
3030
3131 /**
Index: branches/wmf/1.19wmf1/includes/MagicWord.php
@@ -290,8 +290,8 @@
291291 $wgContLang->getMagic( $this );
292292 if ( !$this->mSynonyms ) {
293293 $this->mSynonyms = array( 'dkjsagfjsgashfajsh' );
294 - #throw new MWException( "Error: invalid magic word '$id'" );
295 - wfDebugLog( 'exception', "Error: invalid magic word '$id'\n" );
 294+ throw new MWException( "Error: invalid magic word '$id'" );
 295+ #wfDebugLog( 'exception', "Error: invalid magic word '$id'\n" );
296296 }
297297 wfProfileOut( __METHOD__ );
298298 }

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r105964Temporary workaround for bug 31576. The logs show that once every hour or so,...tstarling01:14, 13 December 2011
r106137Use the pure PHP version of CDB so that we can get better error handling and ...tstarling23:51, 13 December 2011

Status & tagging log