| Index: trunk/phase3/maintenance/language/messages.inc |
| — | — | @@ -2410,11 +2410,3 @@ |
| 2411 | 2411 | 'exif-orientation-8' => '0th row: left; 0th column: bottom', |
| 2412 | 2412 | 'movepage-moved' => 'The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.' |
| 2413 | 2413 | ); |
| 2414 | | - |
| 2415 | | -/** Messages which contain dollar signs (which are not followed by numbers), and therefore should use a single apostrophe */ |
| 2416 | | -$wgMessagseWithDollarSigns = array( |
| 2417 | | - 'linkprefix', |
| 2418 | | - 'enotif_subject', |
| 2419 | | - 'enotif_body', |
| 2420 | | - 'allmessagesnotsupportedDB', |
| 2421 | | -); |
| Index: trunk/phase3/maintenance/language/writeMessagesArray.inc |
| — | — | @@ -103,8 +103,7 @@ |
| 104 | 104 | * @return The block, formatted in PHP. |
| 105 | 105 | */ |
| 106 | 106 | function writeMessagesBlock( $name, $comment, $messages, $ignoredComments ) { |
| 107 | | - global $wgMessageComments, $wgMessagseWithDollarSigns; |
| 108 | | - global $wgIgnoredMessages, $wgOptionalMessages; |
| | 107 | + global $wgMessageComments, $wgIgnoredMessages, $wgOptionalMessages; |
| 109 | 108 | $blockText = ''; |
| 110 | 109 | |
| 111 | 110 | # Skip the block if it includes no messages |
| — | — | @@ -142,7 +141,7 @@ |
| 143 | 142 | # Check for the appropriate apostrophe and add the value |
| 144 | 143 | if ( strpos( $value, "'" ) === false ) { |
| 145 | 144 | $blockText .= "'$value'"; |
| 146 | | - } elseif ( strpos( $value, '"' ) === false && !in_array( $key, $wgMessagseWithDollarSigns ) ) { |
| | 145 | + } elseif ( strpos( $value, '"' ) === false && !preg_match('/\$[a-zA-Z]/', $value) ) { |
| 147 | 146 | $blockText .= "\"$value\""; |
| 148 | 147 | } else { |
| 149 | 148 | # Pick the less numerous one to escape |