http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74021
Revision: 74021
Author: neilk
Date: 2010-09-30 13:52:16 +0000 (Thu, 30 Sep 2010)
Log Message:
-----------
removing useless debug or other experiments
Modified Paths:
--------------
branches/uploadwizard/phase3/includes/MimeMagic.php
branches/uploadwizard/phase3/includes/Namespace.php
branches/uploadwizard/phase3/languages/Language.php
Modified: branches/uploadwizard/phase3/includes/MimeMagic.php
===================================================================
--- branches/uploadwizard/phase3/includes/MimeMagic.php 2010-09-30 13:50:10 UTC
(rev 74020)
+++ branches/uploadwizard/phase3/includes/MimeMagic.php 2010-09-30 13:52:16 UTC
(rev 74021)
@@ -492,7 +492,6 @@
}
private function doGuessMimeType( $file, $ext ) { # TODO: remove $ext
param
- wfDebug( __METHOD__ . " in guess mime type for $file, $ext " );
// Read a chunk of the file
wfSuppressWarnings();
$f = fopen( $file, "rt" );
Modified: branches/uploadwizard/phase3/includes/Namespace.php
===================================================================
--- branches/uploadwizard/phase3/includes/Namespace.php 2010-09-30 13:50:10 UTC
(rev 74020)
+++ branches/uploadwizard/phase3/includes/Namespace.php 2010-09-30 13:52:16 UTC
(rev 74021)
@@ -25,7 +25,7 @@
NS_HELP => 'Help',
NS_HELP_TALK => 'Help_talk',
NS_CATEGORY => 'Category',
- NS_CATEGORY_TALK => 'Category_talk'
+ NS_CATEGORY_TALK => 'Category_talk',
);
/// @todo UGLY UGLY
Modified: branches/uploadwizard/phase3/languages/Language.php
===================================================================
--- branches/uploadwizard/phase3/languages/Language.php 2010-09-30 13:50:10 UTC
(rev 74020)
+++ branches/uploadwizard/phase3/languages/Language.php 2010-09-30 13:52:16 UTC
(rev 74021)
@@ -192,12 +192,9 @@
function __construct() {
$this->mConverter = new FakeConverter( $this );
// Set the code to the name of the descendant
- if ( $this->mCode ) {
- return $this->mCode;
- } elseif ( get_class( $this ) == 'Language' ) {
+ if ( get_class( $this ) == 'Language' ) {
$this->mCode = 'en';
} else {
- // XXX this is a bad idea, to assume regular naming --
can't pass in test or other custom objects
$this->mCode = str_replace( '_', '-', strtolower(
substr( get_class( $this ), 8 ) ) );
}
self::getLocalisationCache();
@@ -2556,11 +2553,6 @@
* @return string Correct form of plural for $count in this language
*/
function convertPlural( $count, $forms ) {
-
- // print '<pre>';
- // var_dump( debug_backtrace() );
- // print '</pre>';
- // die( "the end" );
if ( !count( $forms ) ) {
return '';
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
