| Index: trunk/phase3/includes/Action.php |
| — | — | @@ -146,7 +146,7 @@ |
| 147 | 147 | /** |
| 148 | 148 | * Shortcut to get the user Language being used for this instance |
| 149 | 149 | * |
| 150 | | - * @return Skin |
| | 150 | + * @return Language |
| 151 | 151 | */ |
| 152 | 152 | public final function getLanguage() { |
| 153 | 153 | return $this->getContext()->getLanguage(); |
| — | — | @@ -156,7 +156,7 @@ |
| 157 | 157 | * Shortcut to get the user Language being used for this instance |
| 158 | 158 | * |
| 159 | 159 | * @deprecated 1.19 Use getLanguage instead |
| 160 | | - * @return Skin |
| | 160 | + * @return Language |
| 161 | 161 | */ |
| 162 | 162 | public final function getLang() { |
| 163 | 163 | wfDeprecated( __METHOD__, '1.19' ); |
| — | — | @@ -294,8 +294,6 @@ |
| 295 | 295 | |
| 296 | 296 | /** |
| 297 | 297 | * Execute the action in a silent fashion: do not display anything or release any errors. |
| 298 | | - * @param $data Array values that would normally be in the POST request |
| 299 | | - * @param $captureErrors Bool whether to catch exceptions and just return false |
| 300 | 298 | * @return Bool whether execution was successful |
| 301 | 299 | */ |
| 302 | 300 | public abstract function execute(); |
| Index: trunk/extensions/OpenStackManager/special/SpecialNovaInstance.php |
| — | — | @@ -487,6 +487,10 @@ |
| 488 | 488 | $header .= Html::element( 'th', array(), wfMsg( 'openstackmanager-launchtime' ) ); |
| 489 | 489 | $header .= Html::element( 'th', array(), wfMsg( 'openstackmanager-actions' ) ); |
| 490 | 490 | $projectArr = array(); |
| | 491 | + |
| | 492 | + /** |
| | 493 | + * @var $instance OpenStackNovaInstance |
| | 494 | + */ |
| 491 | 495 | foreach ( $instances as $instance ) { |
| 492 | 496 | $project = $instance->getOwner(); |
| 493 | 497 | if ( ! in_array( $project, $userProjects ) ) { |
| — | — | @@ -591,7 +595,8 @@ |
| 592 | 596 | $title = Title::newFromText( $this->getOutput()->getPageTitle() ); |
| 593 | 597 | $job = new OpenStackNovaHostJob( $title, array( 'instanceid' => $instance->getInstanceId() ) ); |
| 594 | 598 | $job->insert(); |
| 595 | | - $this->getOutput()->addWikiMsg( 'openstackmanager-createdinstance', $instance->getInstanceID(), $instance->getImageId(), $host->getFullyQualifiedHostName() ); |
| | 599 | + $this->getOutput()->addWikiMsg( 'openstackmanager-createdinstance', $instance->getInstanceID(), |
| | 600 | + $instance->getImageId(), $host->getFullyQualifiedHostName() ); |
| 596 | 601 | } else { |
| 597 | 602 | $this->userNova->terminateInstance( $instance->getInstanceId() ); |
| 598 | 603 | $this->getOutput()->addWikiMsg( 'openstackmanager-createfailedldap' ); |
| Index: trunk/extensions/CodeReview/maintenance/deleteBadTags.php |
| — | — | @@ -4,7 +4,7 @@ |
| 5 | 5 | if ( $IP === false ) { |
| 6 | 6 | $IP = dirname( __FILE__ ) . '/../../..'; |
| 7 | 7 | } |
| 8 | | -require "$IP/maintenance/commandLine.inc"; |
| | 8 | +require_once( "$IP/maintenance/commandLine.inc" ); |
| 9 | 9 | |
| 10 | 10 | echo "Usage: php deleteBadTags.php [commit]\n"; |
| 11 | 11 | |