| Index: trunk/phase3/includes/ConfEditor.php |
| — | — | @@ -306,11 +306,17 @@ |
| 307 | 307 | function parseScalar( $str ) { |
| 308 | 308 | if ( $str !== '' && $str[0] == '\'' ) |
| 309 | 309 | // Single-quoted string |
| 310 | | - return strtr( substr( $str, 1, -1 ), |
| | 310 | + // @fixme trim() call is due to mystery bug where whitespace gets |
| | 311 | + // appended to the token; without it we ended up reading in the |
| | 312 | + // extra quote on the end! |
| | 313 | + return strtr( substr( trim( $str ), 1, -1 ), |
| 311 | 314 | array( '\\\'' => '\'', '\\\\' => '\\' ) ); |
| 312 | 315 | if ( $str !== '' && @$str[0] == '"' ) |
| 313 | 316 | // Double-quoted string |
| 314 | | - return stripcslashes( substr( $str, 1, -1 ) ); |
| | 317 | + // @fixme trim() call is due to mystery bug where whitespace gets |
| | 318 | + // appended to the token; without it we ended up reading in the |
| | 319 | + // extra quote on the end! |
| | 320 | + return stripcslashes( substr( trim( $str ), 1, -1 ) ); |
| 315 | 321 | if ( substr( $str, 0, 4 ) == 'true' ) |
| 316 | 322 | return true; |
| 317 | 323 | if ( substr( $str, 0, 5 ) == 'false' ) |