| Index: trunk/extensions/Translate/SpecialManageGroups.php |
| — | — | @@ -220,18 +220,14 @@ |
| 221 | 221 | $changed[] = '<ul>'; |
| 222 | 222 | } |
| 223 | 223 | |
| 224 | | - $requestKey = str_replace( '.', '_', $key ); |
| 225 | | - $requestKey = str_replace( ' ', '_', $key ); |
| 226 | | - $action = $wgRequest->getVal( "action-$type-$key" ); |
| | 224 | + $action = $wgRequest->getVal( MessageWebImporter::escapeNameForPHP( "action-$type-$key" ) ); |
| 227 | 225 | |
| 228 | 226 | if ( $action === null ) { |
| 229 | | - $message = wfMsgExt( 'translate-manage-inconsistent', 'parseinline', wfEscapeWikiText( "action-$type-$requestKey" ) ); |
| | 227 | + $message = wfMsgExt( 'translate-manage-inconsistent', 'parseinline', wfEscapeWikiText( "action-$type-$key" ) ); |
| 230 | 228 | $changed[] = "<li>$message</li></ul>"; |
| 231 | 229 | $process = false; |
| 232 | 230 | } else { |
| 233 | | - /** |
| 234 | | - * Check processing time. |
| 235 | | - */ |
| | 231 | + // Initialise processing time counter. |
| 236 | 232 | if ( !isset( $this->time ) ) { |
| 237 | 233 | $this->time = wfTimestamp(); |
| 238 | 234 | } |
| — | — | @@ -274,7 +270,9 @@ |
| 275 | 271 | |
| 276 | 272 | foreach ( $actions as $action ) { |
| 277 | 273 | $label = wfMsg( "translate-manage-action-$action" ); |
| 278 | | - $act[] = Xml::radioLabel( $label, "action-$type-$key", $action, "action-$key-$action", $action === $defaction ); |
| | 274 | + $name = self::escapeNameForPHP( "action-$type-$key" ); |
| | 275 | + $id = Sanitizer::escapeId( "action-$key-$action" ); |
| | 276 | + $act[] = Xml::radioLabel( $label, $name, $action, $id, $action === $defaction ); |
| 279 | 277 | } |
| 280 | 278 | |
| 281 | 279 | $name = wfMsg( 'translate-manage-import-diff', |