r86882 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r86881‎ | r86882 | r86883 >
Date:18:53, 25 April 2011
Author:laner
Status:ok
Tags:
Comment:
Fix for MediaWiki 1.18 compatibility; use JSON calls instead of YAML calls.
Modified paths:
  • /trunk/extensions/OpenStackManager/OpenStackNovaController.php (modified) (history)

Diff [purge]

Index: trunk/extensions/OpenStackManager/OpenStackNovaController.php
@@ -260,7 +260,7 @@
261261 $userdata .= $endl;
262262 $userdata .= $boundary;
263263 if ( $wgOpenStackManagerInstanceUserData['cloud-config'] ) {
264 - $userdata .= $endl . $this->getAttachmentMime( Spyc::YAMLDump( $wgOpenStackManagerInstanceUserData['cloud-config'] ), 'text/cloud-config', 'cloud-config.txt' );
 264+ $userdata .= $endl . $this->getAttachmentMime( FormatJson::encode( $wgOpenStackManagerInstanceUserData['cloud-config'] ), 'text/cloud-config', 'cloud-config.txt' );
265265 $userdata .= $endl . $boundary;
266266 }
267267 if ( $wgOpenStackManagerInstanceUserData['scripts'] ) {

Status & tagging log