https://www.mediawiki.org/wiki/Special:Code/MediaWiki/113411
Revision: 113411
Author: catrope
Date: 2012-03-08 22:08:39 +0000 (Thu, 08 Mar 2012)
Log Message:
-----------
1.19wmf1: MFT r105964, r106137
Modified Paths:
--------------
branches/wmf/1.19wmf1/includes/Cdb.php
branches/wmf/1.19wmf1/includes/MagicWord.php
Modified: branches/wmf/1.19wmf1/includes/Cdb.php
===================================================================
--- branches/wmf/1.19wmf1/includes/Cdb.php 2012-03-08 22:00:49 UTC (rev
113410)
+++ branches/wmf/1.19wmf1/includes/Cdb.php 2012-03-08 22:08:39 UTC (rev
113411)
@@ -19,12 +19,12 @@
* @return CdbReader
*/
public static function open( $fileName ) {
- if ( self::haveExtension() ) {
- return new CdbReader_DBA( $fileName );
- } else {
- wfDebug( "Warning: no dba extension found, using
emulation.\n" );
+ //if ( self::haveExtension() ) {
+ // return new CdbReader_DBA( $fileName );
+ //} else {
+ // wfDebug( "Warning: no dba extension found, using
emulation.\n" );
return new CdbReader_PHP( $fileName );
- }
+ //}
}
/**
Modified: branches/wmf/1.19wmf1/includes/MagicWord.php
===================================================================
--- branches/wmf/1.19wmf1/includes/MagicWord.php 2012-03-08 22:00:49 UTC
(rev 113410)
+++ branches/wmf/1.19wmf1/includes/MagicWord.php 2012-03-08 22:08:39 UTC
(rev 113411)
@@ -290,8 +290,8 @@
$wgContLang->getMagic( $this );
if ( !$this->mSynonyms ) {
$this->mSynonyms = array( 'dkjsagfjsgashfajsh' );
- #throw new MWException( "Error: invalid magic word
'$id'" );
- wfDebugLog( 'exception', "Error: invalid magic word
'$id'\n" );
+ throw new MWException( "Error: invalid magic word
'$id'" );
+ #wfDebugLog( 'exception', "Error: invalid magic word
'$id'\n" );
}
wfProfileOut( __METHOD__ );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
