http://www.mediawiki.org/wiki/Special:Code/MediaWiki/69041
Revision: 69041
Author: demon
Date: 2010-07-05 00:29:38 +0000 (Mon, 05 Jul 2010)
Log Message:
-----------
Make visibilities actually mean it
Modified Paths:
--------------
trunk/phase3/includes/installer/Installer.php
trunk/phase3/includes/installer/WebInstaller.php
Modified: trunk/phase3/includes/installer/Installer.php
===================================================================
--- trunk/phase3/includes/installer/Installer.php 2010-07-05 00:06:06 UTC
(rev 69040)
+++ trunk/phase3/includes/installer/Installer.php 2010-07-05 00:29:38 UTC
(rev 69041)
@@ -11,9 +11,8 @@
* MediaWiki configuration globals that will eventually be passed
through
* to LocalSettings.php. The names only are given here, the defaults
* typically come from DefaultSettings.php.
- * @protected
*/
- var $defaultVarNames = array(
+ protected $defaultVarNames = array(
'wgSitename',
'wgPasswordSender',
'wgLanguageCode',
@@ -44,9 +43,8 @@
* Variables that are stored alongside globals, and are used for any
* configuration of the installation process aside from the MediaWiki
* configuration. Map of names to defaults.
- * @protected
*/
- var $internalDefaults = array(
+ protected $internalDefaults = array(
'_UserLang' => 'en',
'_Environment' => false,
'_CompiledDBs' => array(),
@@ -78,9 +76,8 @@
*
* To add a new type, create a <type>Installer class and a
Database<type>
* class, and add a config-type-<type> message to MessagesEn.php.
- * @private
*/
- var $dbTypes = array(
+ private $dbTypes = array(
'mysql',
'postgres',
'sqlite',
@@ -94,17 +91,15 @@
/**
* Cached DB installer instances, access using getDBInstaller()
- * @private
*/
- var $dbInstallers = array();
+ private $dbInstallers = array();
/**
* A list of environment check methods called by doEnvironmentChecks().
* These may output warnings using showMessage(), and/or abort the
* installation process by returning false.
- * @protected
*/
- var $envChecks = array(
+ protected $envChecks = array(
'envLatestVersion',
'envCheckDB',
'envCheckRegisterGlobals',
@@ -126,7 +121,10 @@
'envCheckUploadsDirectory',
);
- var $installSteps = array(
+ /**
+ * Steps for installation.
+ */
+ protected $installSteps = array(
'database',
'tables',
'interwiki',
@@ -137,9 +135,8 @@
/**
* Known object cache types and the functions used to test for their
existence
- * @protected
*/
- var $objectCaches = array(
+ protected $objectCaches = array(
'xcache' => 'xcache_get',
'apc' => 'apc_fetch',
'eaccel' => 'eaccelerator_get',
@@ -207,9 +204,8 @@
);
/**
* Cached Title and ParserOptions used by parse()
- * @private
*/
- var $parserTitle, $parserOptions;
+ private $parserTitle, $parserOptions;
/**
* Constructor, always call this from child classes
Modified: trunk/phase3/includes/installer/WebInstaller.php
===================================================================
--- trunk/phase3/includes/installer/WebInstaller.php 2010-07-05 00:06:06 UTC
(rev 69040)
+++ trunk/phase3/includes/installer/WebInstaller.php 2010-07-05 00:29:38 UTC
(rev 69041)
@@ -271,9 +271,8 @@
/**
* Clean up from execute()
- * @private.
*/
- function finish() {
+ private function finish() {
$this->output->output();
$this->session['happyPages'] = $this->happyPages;
$this->session['skippedPages'] = $this->skippedPages;
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
