| Index: branches/wmf-deployment/includes/ConfEditor.php |
| — | — | @@ -310,8 +310,7 @@ |
| 311 | 311 | array( '\\\'' => '\'', '\\\\' => '\\' ) ); |
| 312 | 312 | if ( $str !== '' && @$str[0] == '"' ) |
| 313 | 313 | // Double-quoted string |
| 314 | | - return strtr( stripcslashes( substr( $str, 1, -1 ) ), |
| 315 | | - array( '\'' => '\\\'' ) ); |
| | 314 | + return stripcslashes( substr( $str, 1, -1 ) ); |
| 316 | 315 | if ( substr( $str, 0, 4 ) == 'true' ) |
| 317 | 316 | return true; |
| 318 | 317 | if ( substr( $str, 0, 5 ) == 'false' ) |
| Property changes on: branches/wmf-deployment/includes/ConfEditor.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 319 | 318 | - /trunk/phase3/includes/ConfEditor.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806 |
| 320 | 319 | + /trunk/phase3/includes/ConfEditor.php:52290,52402,52404,52718,52737,52759,52776,52791,52800,52808,52812-52813,52815-52819,52822,52846,52850,52852-52853,52855-52857,52859,52924,52986,53128-53129,53190,53197,53199,53203-53204,53210-53211,53247,53249,53252,53267,53270,53293,53305,53344,53369,53427,53502-53504,53506,53777,54384,54494,54592,54599-54602,54604,54613,54764,54793,54806,54987 |