http://www.mediawiki.org/wiki/Special:Code/MediaWiki/70153
Revision: 70153
Author: jeroendedauw
Date: 2010-07-29 18:25:10 +0000 (Thu, 29 Jul 2010)
Log Message:
-----------
Style and doc improvements
Modified Paths:
--------------
trunk/phase3/includes/installer/CoreInstaller.php
trunk/phase3/includes/installer/LocalSettingsGenerator.php
Modified: trunk/phase3/includes/installer/CoreInstaller.php
===================================================================
--- trunk/phase3/includes/installer/CoreInstaller.php 2010-07-29 18:18:03 UTC
(rev 70152)
+++ trunk/phase3/includes/installer/CoreInstaller.php 2010-07-29 18:25:10 UTC
(rev 70153)
@@ -160,7 +160,7 @@
'icon' => '{$wgStylePath}/common/images/gnu-fdl.png',
),
'cc-choose' => array(
- // details will be filled in by the selector
+ // Details will be filled in by the selector.
'url' => '',
'icon' => '',
'text' => '',
Modified: trunk/phase3/includes/installer/LocalSettingsGenerator.php
===================================================================
--- trunk/phase3/includes/installer/LocalSettingsGenerator.php 2010-07-29
18:18:03 UTC (rev 70152)
+++ trunk/phase3/includes/installer/LocalSettingsGenerator.php 2010-07-29
18:25:10 UTC (rev 70153)
@@ -1,6 +1,7 @@
<?php
class LocalSettingsGenerator {
+
private $extensions = array();
private $values = array();
private $configPath = '';
@@ -64,6 +65,13 @@
$this->values['wgEmergencyContact'] =
$this->values['wgPasswordSender'];
}
+ /**
+ * Returns the escaped version of a string of php code.
+ *
+ * @param $string String
+ *
+ * @return String
+ */
public static function escapePhpString( $string ) {
if ( is_array( $string ) || is_object( $string ) ) {
return false;
@@ -85,7 +93,8 @@
/**
* Return the full text of the generated LocalSettings.php file,
* including the extensions
- * @returns String
+ *
+ * @return String
*/
public function getText() {
$localSettings = $this->getDefaultText();
@@ -101,6 +110,9 @@
return $localSettings;
}
+ /**
+ * @return String
+ */
private function buildMemcachedServerList() {
$servers = $this->values['_MemCachedServers'];
@@ -119,6 +131,9 @@
}
}
+ /**
+ * @return String
+ */
private function getDefaultText() {
if( !$this->values['wgImageMagickConvertCommand'] ) {
$this->values['wgImageMagickConvertCommand'] =
'/usr/bin/convert';
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
