* (bug 3489) PHP 5.1 compat problem with captioned images

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c5198d2..6537359 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -113,6 +113,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 3485) Fix bogus warning about filename capitalization when off
 * (bug 2792) Update rebuildrecentchanges.inc for new schema
 * Special:Import/importDump fixes: report XML parse errors, accept <minor/>
+* (bug 3489) PHP 5.1 compat problem with captioned images
 
 
 === Caveats ===

diff --git a/includes/Parser.php b/includes/Parser.php
index df27432..81e932a 100644 (file)
--- a/includes/Parser.php
+++ b/includes/Parser.php
@@ -1345,7 +1345,8 @@ class Parser
                                        $found = false;
                                        while (isset ($a[$k+1]) ) {
                                                #look at the next 'line' to see if we can close it there
-                                               $next_line =  array_shift(array_splice( $a, $k + 1, 1) );
+                                               $spliced = array_splice( $a, $k + 1, 1 );
+                                               $next_line = array_shift( $spliced );
                                                if( preg_match("/^(.*?]].*?)]](.*)$/sD", $next_line, $m) ) {
                                                # the first ]] closes the inner link, the second the image
                                                        $found = true;