* (bug 13022) Fix upload from URL on PHP 5.0.x

PHP 5.0.x whines about pass-by-ref, apparently :P

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 58ab9e0..f470446 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -43,6 +43,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13149) Correctly format 'fileexists' message on Upload page.
 * Make filepageexists accurate.
 * (bug 12988) $wgMinimalPasswordLength no longer breaks create user by email
+* (bug 13022) Fix upload from URL on PHP 5.0.x
 
 === API changes in 1.13 ===
 

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index c2ad0bc..0583c1d 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -141,7 +141,8 @@ class UploadForm {
                $this->mTempPath       = $local_file;
                $this->mFileSize       = 0; # Will be set by curlCopy
                $this->mCurlError      = $this->curlCopy( $url, $local_file );
-               $this->mSrcName        = array_pop( explode( '/', $url ) );
+               $pathParts             = explode( '/', $url );
+               $this->mSrcName        = array_pop( $pathParts );
                $this->mSessionKey     = false;
                $this->mStashed        = false;