| Index: trunk/extensions/Arrays/RELEASE-NOTES |
| — | — | @@ -1,6 +1,9 @@ |
| 2 | 2 | Changelog: |
| 3 | 3 | ========== |
| 4 | 4 | |
| | 5 | + * (trunk) -- Version 2.0rc3 alpha |
| | 6 | + - Adjusted to work with 'Regex Fun' version 1.1 |
| | 7 | + |
| 5 | 8 | * December 5, 2011 -- Version 2.0rc2 |
| 6 | 9 | - Bug introduced in r105069 fixed where '#arrayprint' was broken in compatibility mode in some cases. |
| 7 | 10 | - '#arraysearcharray' with 'e' using 'Regex Fun' no longer requires an escaped transform (parameter 6) |
| Index: trunk/extensions/Arrays/Arrays.php |
| — | — | @@ -11,7 +11,7 @@ |
| 12 | 12 | * @ingroup Arrays |
| 13 | 13 | * |
| 14 | 14 | * @licence MIT License |
| 15 | | - * @version: 2.0rc2 |
| | 15 | + * @version: 2.0rc3 alpha |
| 16 | 16 | * |
| 17 | 17 | * @author Li Ding < lidingpku@gmail.com > |
| 18 | 18 | * @author Jie Bao |
| — | — | @@ -53,7 +53,7 @@ |
| 54 | 54 | * |
| 55 | 55 | * @since 2.0 (before in 'Arrays' class since 1.3.2) |
| 56 | 56 | */ |
| 57 | | - const VERSION = '2.0rc2'; |
| | 57 | + const VERSION = '2.0rc3 alpha'; |
| 58 | 58 | |
| 59 | 59 | /** |
| 60 | 60 | * Store for arrays. |
| — | — | @@ -312,7 +312,7 @@ |
| 313 | 313 | |
| 314 | 314 | // if there is no subject, there is no point in expanding. Faster! |
| 315 | 315 | if( $subject === null ) { |
| 316 | | - if( ! $egArraysCompatibilityMode ) { |
| | 316 | + if( ! $egArraysCompatibilityMode && $egArraysExpansionEscapeTemplates !== null ) { |
| 317 | 317 | // we can ignore options here, since if subject is null, options won't be set as well! |
| 318 | 318 | return trim( implode( $delimiter, $array ) ); |
| 319 | 319 | } else { |
| — | — | @@ -565,7 +565,7 @@ |
| 566 | 566 | if( preg_match( $needle, $value ) ) { |
| 567 | 567 | // Found something! |
| 568 | 568 | if( $rawTransform !== null ) { |
| 569 | | - // Transform the found string. Can we use 'Regex Fun' ? |
| | 569 | + // Transform the matching string. Can we use 'Regex Fun' with special 'e' flag support ? |
| 570 | 570 | if( $regexFunSupport ) { |
| 571 | 571 | // do the transformation with Regex Fun to support 'e' flag: |
| 572 | 572 | $transform = trim( $frame->expand( |
| — | — | @@ -574,10 +574,11 @@ |
| 575 | 575 | ) ); |
| 576 | 576 | $value = ExtRegexFun::doPregReplace( |
| 577 | 577 | $needle, |
| 578 | | - $transform, |
| | 578 | + $rawTransform, |
| 579 | 579 | $value, |
| 580 | 580 | -1, |
| 581 | 581 | $parser, |
| | 582 | + $frame, |
| 582 | 583 | array( ExtRegexFun::FLAG_REPLACEMENT_PARSE ) |
| 583 | 584 | ); |
| 584 | 585 | } |
| — | — | @@ -1247,6 +1248,8 @@ |
| 1248 | 1249 | * changed because of special characters. |
| 1249 | 1250 | * Respects the configuration variable '$egArraysEscapeTemplates'. |
| 1250 | 1251 | * |
| | 1252 | + * This is a workaround for bug #32829 |
| | 1253 | + * |
| 1251 | 1254 | * @since 2.0 |
| 1252 | 1255 | * |
| 1253 | 1256 | * @param string $string |
| — | — | @@ -1301,7 +1304,7 @@ |
| 1302 | 1305 | if( $support === null ) { |
| 1303 | 1306 | $support = ( |
| 1304 | 1307 | defined( 'ExtRegexFun::VERSION' ) |
| 1305 | | - && version_compare( ExtRegexFun::VERSION, '1.0.1', '>=' ) |
| | 1308 | + && version_compare( ExtRegexFun::VERSION, '1.1', '>=' ) |
| 1306 | 1309 | ); |
| 1307 | 1310 | } |
| 1308 | 1311 | return $support; |
| Index: trunk/extensions/Arrays/Arrays_Settings.php |
| — | — | @@ -43,4 +43,4 @@ |
| 44 | 44 | '|' => '{{!}}', |
| 45 | 45 | '{{' => '{{((}}', |
| 46 | 46 | '}}' => '{{))}}' |
| 47 | | -); |
| \ No newline at end of file |
| | 47 | +); |