http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72136
Revision: 72136
Author: demon
Date: 2010-09-01 18:16:05 +0000 (Wed, 01 Sep 2010)
Log Message:
-----------
More duplication reduction
Modified Paths:
--------------
trunk/phase3/includes/installer/DatabaseInstaller.php
trunk/phase3/includes/installer/MysqlInstaller.php
trunk/phase3/includes/installer/SqliteInstaller.php
Modified: trunk/phase3/includes/installer/DatabaseInstaller.php
===================================================================
--- trunk/phase3/includes/installer/DatabaseInstaller.php 2010-09-01
18:14:17 UTC (rev 72135)
+++ trunk/phase3/includes/installer/DatabaseInstaller.php 2010-09-01
18:16:05 UTC (rev 72136)
@@ -424,4 +424,7 @@
return Status::newGood();
}
-}
\ No newline at end of file
+ public function outputHandler( $string ) {
+ return htmlspecialchars( $string );
+ }
+}
Modified: trunk/phase3/includes/installer/MysqlInstaller.php
===================================================================
--- trunk/phase3/includes/installer/MysqlInstaller.php 2010-09-01 18:14:17 UTC
(rev 72135)
+++ trunk/phase3/includes/installer/MysqlInstaller.php 2010-09-01 18:16:05 UTC
(rev 72136)
@@ -198,7 +198,7 @@
$ret = true;
- ob_start( array( __CLASS__, 'outputHandler' ) );
+ ob_start( array( $this, 'outputHandler' ) );
try {
do_all_updates( false, true );
} catch ( MWException $e ) {
@@ -210,10 +210,6 @@
return $ret;
}
- public static function outputHandler( $string ) {
- return htmlspecialchars( $string );
- }
-
/**
* Get a list of storage engines that are available and supported
*/
Modified: trunk/phase3/includes/installer/SqliteInstaller.php
===================================================================
--- trunk/phase3/includes/installer/SqliteInstaller.php 2010-09-01 18:14:17 UTC
(rev 72135)
+++ trunk/phase3/includes/installer/SqliteInstaller.php 2010-09-01 18:16:05 UTC
(rev 72136)
@@ -186,16 +186,12 @@
global $wgDatabase;
LBFactory::enableBackend();
$wgDatabase = wfGetDB( DB_MASTER );
- ob_start( array( 'SqliteInstaller', 'outputHandler' ) );
+ ob_start( array( $this, 'outputHandler' ) );
do_all_updates( false, true );
ob_end_flush();
return true;
}
- public static function outputHandler( $string ) {
- return htmlspecialchars( $string );
- }
-
public function getLocalSettings() {
$dir = LocalSettingsGenerator::escapePhpString( $this->getVar(
'wgSQLiteDataDir' ) );
return
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
