https://www.mediawiki.org/wiki/Special:Code/MediaWiki/108374
Revision: 108374
Author: reedy
Date: 2012-01-08 22:38:08 +0000 (Sun, 08 Jan 2012)
Log Message:
-----------
Fixup documentation
Swap require for require_once
Wrap long line
Modified Paths:
--------------
trunk/extensions/CodeReview/maintenance/deleteBadTags.php
trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php
trunk/phase3/includes/Action.php
Modified: trunk/extensions/CodeReview/maintenance/deleteBadTags.php
===================================================================
--- trunk/extensions/CodeReview/maintenance/deleteBadTags.php 2012-01-08
22:36:13 UTC (rev 108373)
+++ trunk/extensions/CodeReview/maintenance/deleteBadTags.php 2012-01-08
22:38:08 UTC (rev 108374)
@@ -4,7 +4,7 @@
if ( $IP === false ) {
$IP = dirname( __FILE__ ) . '/../../..';
}
-require "$IP/maintenance/commandLine.inc";
+require_once( "$IP/maintenance/commandLine.inc" );
echo "Usage: php deleteBadTags.php [commit]\n";
Modified: trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php
===================================================================
--- trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php
2012-01-08 22:36:13 UTC (rev 108373)
+++ trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php
2012-01-08 22:38:08 UTC (rev 108374)
@@ -487,6 +487,10 @@
$header .= Html::element( 'th', array(), wfMsg(
'openstackmanager-launchtime' ) );
$header .= Html::element( 'th', array(), wfMsg(
'openstackmanager-actions' ) );
$projectArr = array();
+
+ /**
+ * @var $instance OpenStackNovaInstance
+ */
foreach ( $instances as $instance ) {
$project = $instance->getOwner();
if ( ! in_array( $project, $userProjects ) ) {
@@ -591,7 +595,8 @@
$title = Title::newFromText(
$this->getOutput()->getPageTitle() );
$job = new OpenStackNovaHostJob( $title, array(
'instanceid' => $instance->getInstanceId() ) );
$job->insert();
- $this->getOutput()->addWikiMsg(
'openstackmanager-createdinstance', $instance->getInstanceID(),
$instance->getImageId(), $host->getFullyQualifiedHostName() );
+ $this->getOutput()->addWikiMsg(
'openstackmanager-createdinstance', $instance->getInstanceID(),
+ $instance->getImageId(),
$host->getFullyQualifiedHostName() );
} else {
$this->userNova->terminateInstance(
$instance->getInstanceId() );
$this->getOutput()->addWikiMsg(
'openstackmanager-createfailedldap' );
Modified: trunk/phase3/includes/Action.php
===================================================================
--- trunk/phase3/includes/Action.php 2012-01-08 22:36:13 UTC (rev 108373)
+++ trunk/phase3/includes/Action.php 2012-01-08 22:38:08 UTC (rev 108374)
@@ -146,7 +146,7 @@
/**
* Shortcut to get the user Language being used for this instance
*
- * @return Skin
+ * @return Language
*/
public final function getLanguage() {
return $this->getContext()->getLanguage();
@@ -156,7 +156,7 @@
* Shortcut to get the user Language being used for this instance
*
* @deprecated 1.19 Use getLanguage instead
- * @return Skin
+ * @return Language
*/
public final function getLang() {
wfDeprecated( __METHOD__, '1.19' );
@@ -294,8 +294,6 @@
/**
* Execute the action in a silent fashion: do not display anything or
release any errors.
- * @param $data Array values that would normally be in the POST request
- * @param $captureErrors Bool whether to catch exceptions and just
return false
* @return Bool whether execution was successful
*/
public abstract function execute();
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
