| Index: branches/wmf/1.17wmf1/includes/UserMailer.php |
| — | — | @@ -466,7 +466,7 @@ |
| 467 | 467 | $keys = array(); |
| 468 | 468 | |
| 469 | 469 | if ( $this->oldid ) { |
| 470 | | - $difflink = $this->title->getFullUrl( 'diff=0&oldid=' . $this->oldid ); |
| | 470 | + $difflink = wfExpandUrl( $this->title->getFullUrl( 'diff=0&oldid=' . $this->oldid ), PROTO_HTTP ); |
| 471 | 471 | $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastvisited', $difflink ); |
| 472 | 472 | $keys['$OLDID'] = $this->oldid; |
| 473 | 473 | $keys['$CHANGEDORCREATED'] = wfMsgForContent( 'changed' ); |
| — | — | @@ -483,17 +483,17 @@ |
| 484 | 484 | * revision. |
| 485 | 485 | */ |
| 486 | 486 | $keys['$NEWPAGE'] = wfMsgForContent( 'enotif_lastdiff', |
| 487 | | - $this->title->getFullURL( "oldid={$this->oldid}&diff=next" ) ); |
| | 487 | + wfExpandUrl( $this->title->getFullURL( "oldid={$this->oldid}&diff=next" ), PROTO_HTTP ) ); |
| 488 | 488 | } |
| 489 | 489 | |
| 490 | 490 | $body = strtr( $body, $keys ); |
| 491 | 491 | $pagetitle = $this->title->getPrefixedText(); |
| 492 | 492 | $keys['$PAGETITLE'] = $pagetitle; |
| 493 | | - $keys['$PAGETITLE_URL'] = $this->title->getFullUrl(); |
| | 493 | + $keys['$PAGETITLE_URL'] = wfExpandUrl( $this->title->getFullUrl(), PROTO_HTTP ); |
| 494 | 494 | |
| 495 | 495 | $keys['$PAGEMINOREDIT'] = $medit; |
| 496 | 496 | $keys['$PAGESUMMARY'] = $summary; |
| 497 | | - $keys['$UNWATCHURL'] = $this->title->getFullUrl( 'action=unwatch' ); |
| | 497 | + $keys['$UNWATCHURL'] = wfExpandUrl( $this->title->getFullUrl( 'action=unwatch' ), PROTO_HTTP ); |
| 498 | 498 | |
| 499 | 499 | $subject = strtr( $subject, $keys ); |
| 500 | 500 | |
| — | — | @@ -528,10 +528,10 @@ |
| 529 | 529 | $subject = str_replace( '$PAGEEDITOR', $name, $subject ); |
| 530 | 530 | $keys['$PAGEEDITOR'] = $name; |
| 531 | 531 | $emailPage = SpecialPage::getSafeTitleFor( 'Emailuser', $name ); |
| 532 | | - $keys['$PAGEEDITOR_EMAIL'] = $emailPage->getFullUrl(); |
| | 532 | + $keys['$PAGEEDITOR_EMAIL'] = wfExpandUrl( $emailPage->getFullUrl(), PROTO_HTTP ); |
| 533 | 533 | } |
| 534 | 534 | $userPage = $editor->getUserPage(); |
| 535 | | - $keys['$PAGEEDITOR_WIKI'] = $userPage->getFullUrl(); |
| | 535 | + $keys['$PAGEEDITOR_WIKI'] = wfExpandUrl( $userPage->getFullUrl(), PROTO_HTTP ); |
| 536 | 536 | $body = strtr( $body, $keys ); |
| 537 | 537 | $body = wordwrap( $body, 72 ); |
| 538 | 538 | |
| Index: branches/wmf/1.17wmf1/includes/resourceloader/ResourceLoaderWikiModule.php |
| — | — | @@ -66,7 +66,7 @@ |
| 67 | 67 | continue; |
| 68 | 68 | } |
| 69 | 69 | $title = Title::newFromText( $titleText ); |
| 70 | | - if ( !$title ) { |
| | 70 | + if ( !$title || $title->isRedirect() ) { |
| 71 | 71 | continue; |
| 72 | 72 | } |
| 73 | 73 | $script = $this->getContent( $title ); |
| — | — | @@ -89,7 +89,7 @@ |
| 90 | 90 | continue; |
| 91 | 91 | } |
| 92 | 92 | $title = Title::newFromText( $titleText ); |
| 93 | | - if ( !$title ) { |
| | 93 | + if ( !$title || $title->isRedirect() ) { |
| 94 | 94 | continue; |
| 95 | 95 | } |
| 96 | 96 | $media = isset( $options['media'] ) ? $options['media'] : 'all'; |
| Index: branches/wmf/1.17wmf1/includes/media/Bitmap.php |
| — | — | @@ -215,7 +215,7 @@ |
| 216 | 216 | // We optimize the output, but -optimize is broken, |
| 217 | 217 | // use optimizeTransparency instead (bug 11822) |
| 218 | 218 | if ( version_compare( $this->getMagickVersion(), "6.3.5" ) >= 0 ) { |
| 219 | | - $animation_post = '-fuzz 5% -layers optimizeTransparency +map'; |
| | 219 | + $animation_post = '-fuzz 5% -layers optimizeTransparency'; |
| 220 | 220 | } |
| 221 | 221 | } |
| 222 | 222 | } |
| Property changes on: branches/wmf/1.17wmf1/includes/media/Bitmap.php |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 223 | 223 | Merged /branches/new-installer/phase3/includes/media/Bitmap.php:r43664-66004 |
| 224 | 224 | Merged /branches/wmf-deployment/includes/media/Bitmap.php:r53381,60970 |
| 225 | 225 | Merged /branches/REL1_15/phase3/includes/media/Bitmap.php:r51646 |
| 226 | 226 | Merged /branches/wmf/1.16wmf4/includes/media/Bitmap.php:r67177,69199,76243,77266 |
| 227 | 227 | Merged /branches/sqlite/includes/media/Bitmap.php:r58211-58321 |
| 228 | 228 | Merged /trunk/phase3/includes/media/Bitmap.php:r83590,87099,89512-89513,90729,93141,93891,94155,94277,94372 |
| Index: branches/wmf/1.17wmf1/includes/media/SVGMetadataExtractor.php |
| — | — | @@ -55,7 +55,7 @@ |
| 56 | 56 | $size = filesize( $source ); |
| 57 | 57 | if ( $size === false ) { |
| 58 | 58 | throw new MWException( "Error getting filesize of SVG." ); |
| 59 | | - } |
| | 59 | + } |
| 60 | 60 | |
| 61 | 61 | if ( $size > $wgSVGMetadataCutoff ) { |
| 62 | 62 | $this->debug( "SVG is $size bytes, which is bigger than $wgSVGMetadataCutoff. Truncating." ); |
| — | — | @@ -157,7 +157,7 @@ |
| 158 | 158 | } |
| 159 | 159 | $keepReading = $this->reader->read(); |
| 160 | 160 | while( $keepReading ) { |
| 161 | | - if( $this->reader->localName == $name && $this->namespaceURI == self::NS_SVG && $this->reader->nodeType == XmlReader::END_ELEMENT ) { |
| | 161 | + if( $this->reader->localName == $name && $this->reader->namespaceURI == self::NS_SVG && $this->reader->nodeType == XmlReader::END_ELEMENT ) { |
| 162 | 162 | break; |
| 163 | 163 | } elseif( $this->reader->nodeType == XmlReader::TEXT ){ |
| 164 | 164 | $this->metadata[$metafield] = trim( $this->reader->value ); |
| Index: branches/wmf/1.17wmf1/includes/WikiMap.php |
| — | — | @@ -132,11 +132,13 @@ |
| 133 | 133 | */ |
| 134 | 134 | public function getDisplayName() { |
| 135 | 135 | $url = $this->getUrl( '' ); |
| 136 | | - $url = preg_replace( '!^https?://!', '', $url ); |
| 137 | | - $url = preg_replace( '!/index\.php(\?title=|/)$!', '/', $url ); |
| 138 | | - $url = preg_replace( '!/wiki/$!', '/', $url ); |
| 139 | | - $url = preg_replace( '!/$!', '', $url ); |
| 140 | | - return $url; |
| | 136 | + $parsed = wfParseUrl( $url ); |
| | 137 | + if ( $parsed ) { |
| | 138 | + return $parsed['host']; |
| | 139 | + } else { |
| | 140 | + // Invalid URL. There's no sane thing to do here, so just return it |
| | 141 | + return $url; |
| | 142 | + } |
| 141 | 143 | } |
| 142 | 144 | |
| 143 | 145 | /** |
| Index: branches/wmf/1.17wmf1/resources/mediawiki.util/mediawiki.util.js |
| — | — | @@ -147,7 +147,7 @@ |
| 148 | 148 | 'getParamValue' : function( param, url ) { |
| 149 | 149 | url = url ? url : document.location.href; |
| 150 | 150 | // Get last match, stop at hash |
| 151 | | - var re = new RegExp( '[^#]*[&?]' + $.escapeRE( param ) + '=([^&#]*)' ); |
| | 151 | + var re = new RegExp( '^[^#]*[&?]' + $.escapeRE( param ) + '=([^&#]*)' ); |
| 152 | 152 | var m = re.exec( url ); |
| 153 | 153 | if ( m && m.length > 1 ) { |
| 154 | 154 | return decodeURIComponent( m[1] ); |
| — | — | @@ -292,9 +292,14 @@ |
| 293 | 293 | // Unhide portlet if it was hidden before |
| 294 | 294 | $portlet.removeClass( 'emptyPortlet' ); |
| 295 | 295 | |
| 296 | | - // Wrap the anchor tag in a <span> and create a list item for it |
| | 296 | + // Wrap the anchor tag in a list item (and a span if $portlet is a Vector tab) |
| 297 | 297 | // and back up the selector to the list item |
| 298 | | - var $item = $link.wrap( '<li><span></span></li>' ).parent().parent(); |
| | 298 | + var $item; |
| | 299 | + if ( $portlet.hasClass( 'vectorTabs' ) ) { |
| | 300 | + $item = $link.wrap( '<li><span></span></li>' ).parent().parent(); |
| | 301 | + } else { |
| | 302 | + $item = $link.wrap( '<li></li>' ).parent(); |
| | 303 | + } |
| 299 | 304 | |
| 300 | 305 | // Implement the properties passed to the function |
| 301 | 306 | if ( id ) { |
| Property changes on: branches/wmf/1.17wmf1/resources/mediawiki.util/mediawiki.util.js |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 302 | 307 | Merged /branches/REL1_15/phase3/resources/mediawiki.util/mediawiki.util.js:r51646 |
| 303 | 308 | Merged /branches/wmf/1.16wmf4/resources/mediawiki.util/mediawiki.util.js:r67177,69199,76243,77266 |
| 304 | 309 | Merged /branches/sqlite/resources/mediawiki.util/mediawiki.util.js:r58211-58321 |
| 305 | 310 | Merged /trunk/phase3/resources/mediawiki.util/mediawiki.util.js:r79828,79830,79848,79853,79950-79951,79954,79989,80006-80007,80013,80016,80080,80083,80124,80128,80238,80406,81833,83212,83590,90729,93141,93891,94155,94277,94372 |
| 306 | 311 | Merged /trunk/phase3/resources/mediawiki/mediawiki.util.js:r90729,93517 |
| 307 | 312 | Merged /branches/new-installer/phase3/resources/mediawiki.util/mediawiki.util.js:r43664-66004 |
| 308 | 313 | Merged /branches/wmf-deployment/resources/mediawiki.util/mediawiki.util.js:r60970 |
| Index: branches/wmf/1.17wmf1/resources/mediawiki/mediawiki.js |
| — | — | @@ -1004,7 +1004,7 @@ |
| 1005 | 1005 | // Allow calling with an external script or single dependency as a string |
| 1006 | 1006 | if ( typeof modules === 'string' ) { |
| 1007 | 1007 | // Support adding arbitrary external scripts |
| 1008 | | - if ( modules.substr( 0, 7 ) == 'http://' || modules.substr( 0, 8 ) == 'https://' ) { |
| | 1008 | + if ( modules.substr( 0, 7 ) === 'http://' || modules.substr( 0, 8 ) === 'https://' || modules.substr( 0, 2 ) === '//' ) { |
| 1009 | 1009 | if ( type === 'text/css' ) { |
| 1010 | 1010 | $( 'head' ) |
| 1011 | 1011 | .append( $( '<link rel="stylesheet" type="text/css" />' ) |
| Property changes on: branches/wmf/1.17wmf1/resources/mediawiki/mediawiki.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1012 | 1012 | Merged /trunk/phase3/resources/mediawiki/mediawiki.js:r90729,93141,93891,94155,94277,94372 |