Merge "(bug 45069) wfParseUrl() no longer produces a PHP notice if passed a "mailto...

diff --combined RELEASE-NOTES-1.21
index 6143030,f49a4b0..2eca857
--- 1/RELEASE-NOTES-1.21
--- 2/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@@ -169,6 -169,8 +169,8 @@@ production
  * (bug 43964) Invalid value of "link" parameter in <gallery> no longer produces
    a fatal error.
  * (bug 44775) The username field is not pre-filled when creating an account.
+ * (bug 45069) wfParseUrl() no longer produces a PHP notice if passed a "mailto:"
+   URL without address
  
  === API changes in 1.21 ===
  * prop=revisions can now report the contentmodel and contentformat.
@@@ -212,7 -214,6 +214,7 @@@
    iicontinue).
  * Add supports for all pageset capabilities - generators, redirects, converttitles to
    action=purge and action=setnotificationtimestamp.
 +* (bug 43251) prop=pageprops&ppprop= now accepts multiple props to query.
  
  === API internal changes in 1.21 ===
  * For debugging only, a new global $wgDebugAPI removes many API restrictions when true.
@@@ -225,8 -226,6 +227,8 @@@
    first one keeping its meaning. ApiPageSet is now derived from ApiBase.
  * BREAKING CHANGE: ApiQuery::newGenerator() and executeGeneratorModule() were deleted.
  * ApiQueryGeneratorBase::setGeneratorMode() now requires a pageset param.
 +* $wgAPIGeneratorModules is now obsolete and will be ignored.
 +* Added flags ApiResult::OVERRIDE and ADD_ON_TOP to setElement() and addValue()
  
  === Languages updated in 1.21 ===
  

diff --combined includes/GlobalFunctions.php
index 0e5fddc,739003a..be862e7
--- 1/includes/GlobalFunctions.php
--- 2/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@@ -809,9 -809,14 +809,14 @@@ function wfParseUrl( $url ) 
        if ( !isset( $bits['host'] ) ) {
                $bits['host'] = '';
  
-               /* parse_url loses the third / for file:///c:/ urls (but not on variants) */
-               if ( substr( $bits['path'], 0, 1 ) !== '/' ) {
-                       $bits['path'] = '/' . $bits['path'];
+               // bug 45069
+               if ( isset( $bits['path'] ) ) {
+                       /* parse_url loses the third / for file:///c:/ urls (but not on variants) */
+                       if ( substr( $bits['path'], 0, 1 ) !== '/' ) {
+                               $bits['path'] = '/' . $bits['path'];
+                       }
+               } else {
+                       $bits['path'] = '';
                }
        }
  
@@@ -3206,7 -3211,6 +3211,7 @@@ function wfDoUpdates( $commit = '' ) 
   * @return string|bool The output number as a string, or false on error
   */
  function wfBaseConvert( $input, $sourceBase, $destBase, $pad = 1, $lowercase = true, $engine = 'auto' ) {
 +      $input = (string)$input;
        if(
                $sourceBase < 2 ||
                $sourceBase > 36 ||