| Index: branches/wmf/1.17wmf1/skins/monobook/main.css |
| — | — | @@ -59,7 +59,6 @@ |
| 60 | 60 | |
| 61 | 61 | table { |
| 62 | 62 | font-size: 100%; |
| 63 | | - color: black; |
| 64 | 63 | } |
| 65 | 64 | a { |
| 66 | 65 | text-decoration: none; |
| Index: branches/wmf/1.17wmf1/skins/common/commonPrint.css |
| — | — | @@ -44,6 +44,9 @@ |
| 45 | 45 | div.floatleft p { |
| 46 | 46 | font-style: italic; |
| 47 | 47 | } |
| | 48 | +div.center { |
| | 49 | + text-align: center; |
| | 50 | +} |
| 48 | 51 | |
| 49 | 52 | /* thumbnails */ |
| 50 | 53 | div.thumb { |
| Index: branches/wmf/1.17wmf1/skins/common/shared.css |
| — | — | @@ -556,6 +556,7 @@ |
| 557 | 557 | background: #f9f9f9; |
| 558 | 558 | border: 1px #aaa solid; |
| 559 | 559 | border-collapse: collapse; |
| | 560 | + color: black; |
| 560 | 561 | } |
| 561 | 562 | .wikitable th, .wikitable td { |
| 562 | 563 | border: 1px #aaa solid; |
| Property changes on: branches/wmf/1.17wmf1/skins/common/shared.css |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 563 | 564 | Merged /trunk/phase3/skins/common/shared.css:r85546,86450,86625,86788,86841,86904,87030 |
| 564 | 565 | Merged /branches/REL1_17/phase3/skins/common/shared.css:r86409 |
| Index: branches/wmf/1.17wmf1/skins/common/diff.css |
| — | — | @@ -54,8 +54,10 @@ |
| 55 | 55 | } |
| 56 | 56 | table.diff td div { |
| 57 | 57 | /* Force-wrap very long lines such as URLs or page-widening char strings. |
| 58 | | - CSS 3 draft..., but Gecko doesn't support it yet: |
| 59 | | - https://bugzilla.mozilla.org/show_bug.cgi?id=99457 */ |
| | 58 | + CSS 3 only (In Gecko 1.9.1 / Firefox 3.5): |
| | 59 | + https://bugzilla.mozilla.org/show_bug.cgi?id=99457 |
| | 60 | + https://developer.mozilla.org/web-tech/2008/08/20/word-wrap-break-word/ |
| | 61 | + https://developer.mozilla.org/En/CSS/Word-wrap */ |
| 60 | 62 | word-wrap: break-word; |
| 61 | 63 | |
| 62 | 64 | /* As fallback, scrollbars will be added for very wide cells |
| Index: branches/wmf/1.17wmf1/skins/vector/screen.css |
| — | — | @@ -73,7 +73,6 @@ |
| 74 | 74 | #p-personal { |
| 75 | 75 | position: absolute; |
| 76 | 76 | top: 0; |
| 77 | | - padding-left: 10em; |
| 78 | 77 | right: 0.75em; |
| 79 | 78 | } |
| 80 | 79 | #p-personal h5 { |
| — | — | @@ -82,7 +81,7 @@ |
| 83 | 82 | #p-personal ul { |
| 84 | 83 | list-style: none; |
| 85 | 84 | margin: 0; |
| 86 | | - padding: 0; |
| | 85 | + padding-left: 10em; /* Keep from overlapping logo */ |
| 87 | 86 | } |
| 88 | 87 | /* @noflip */ |
| 89 | 88 | #p-personal li { |
| — | — | @@ -825,7 +824,6 @@ |
| 826 | 825 | /* Tables */ |
| 827 | 826 | table { |
| 828 | 827 | font-size: 100%; |
| 829 | | - color: black; |
| 830 | 828 | } |
| 831 | 829 | /* Forms */ |
| 832 | 830 | fieldset { |
| Property changes on: branches/wmf/1.17wmf1/skins/vector/screen.css |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 833 | 831 | Merged /branches/REL1_17/phase3/skins/vector/screen.css:r86409 |
| 834 | 832 | Merged /trunk/phase3/skins/vector/screen.css:r85546,86450,86625,86788,86841,86904,87030 |
| Index: branches/wmf/1.17wmf1/extensions/ParserFunctions/ParserFunctions_body.php |
| — | — | @@ -415,6 +415,11 @@ |
| 416 | 416 | # if local time was not requested, convert to UTC |
| 417 | 417 | $tz = new DateTimeZone( 'UTC' ); |
| 418 | 418 | } |
| | 419 | + |
| | 420 | + # Correct for DateTime interpreting 'XXXX' as XX:XX o'clock |
| | 421 | + if ( preg_match( '/^[0-9]{4}$/', $date ) ) { |
| | 422 | + $date = '00:00 '.$date; |
| | 423 | + } |
| 419 | 424 | |
| 420 | 425 | # Parse date |
| 421 | 426 | if ( $date !== '' ) { |
| Index: branches/wmf/1.17wmf1/extensions/Vector/modules/ext.vector.collapsibleTabs.js |
| — | — | @@ -28,7 +28,7 @@ |
| 29 | 29 | $( this ).hide(); |
| 30 | 30 | // add the placeholder |
| 31 | 31 | $( '<span class="placeholder" style="display:none;"></span>' ).insertAfter( this ); |
| 32 | | - $( this ).remove().prependTo( target ).data( 'collapsibleTabsSettings', data ); |
| | 32 | + $( this ).detach().prependTo( target ).data( 'collapsibleTabsSettings', data ); |
| 33 | 33 | $( this ).attr( 'style', 'display:list-item;' ); |
| 34 | 34 | //$.collapsibleTabs.getSettings( $( $.collapsibleTabs.getSettings( $( ele ) ).expandedContainer ) ) |
| 35 | 35 | // .shifting = false; |
| — | — | @@ -65,13 +65,13 @@ |
| 66 | 66 | var $target = $( data.expandedContainer ).find( 'span.placeholder:first' ); |
| 67 | 67 | var expandedWidth = data.expandedWidth; |
| 68 | 68 | $moving.css( "position", "relative" ).css( ( rtl ? 'right' : 'left' ), 0 ).css( 'width', '1px' ); |
| 69 | | - $target.replaceWith( $moving.remove().css( 'width', '1px' ).data( 'collapsibleTabsSettings', data ) |
| 70 | | - .animate( { width: expandedWidth+"px" }, "normal", function() { |
| | 69 | + $target.replaceWith( $moving.detach().css( 'width', '1px' ).data( 'collapsibleTabsSettings', data ) |
| | 70 | + .animate( { width: expandedWidth+"px" }, "normal", function( ) { |
| 71 | 71 | $( this ).attr( 'style', 'display:block;' ); |
| 72 | 72 | //$.collapsibleTabs.getSettings( $( $.collapsibleTabs.getSettings( $( ele ) ).expandedContainer ) ) |
| 73 | 73 | // .shifting = false; |
| 74 | 74 | // Do the above, except with guards for JS errors |
| 75 | | - var data = $.collapsibleTabs.getSettings( $( ele ) ); |
| | 75 | + var data = $.collapsibleTabs.getSettings( $( this ) ); |
| 76 | 76 | if ( !data ) { |
| 77 | 77 | return; |
| 78 | 78 | } |
| Property changes on: branches/wmf/1.17wmf1/extensions/Vector/modules/ext.vector.collapsibleTabs.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 79 | 79 | Merged /branches/REL1_17/phase3/extensions/Vector/modules/ext.vector.collapsibleTabs.js:r86409 |
| 80 | 80 | Merged /trunk/extensions/Vector/modules/ext.vector.collapsibleTabs.js:r86625,86805,87153 |
| Index: branches/wmf/1.17wmf1/extensions/GoogleNewsSitemap/GoogleNewsSitemap_body.php |
| — | — | @@ -276,20 +276,20 @@ |
| 277 | 277 | $conditions['page_namespace'] = $params['namespace']; |
| 278 | 278 | } |
| 279 | 279 | |
| 280 | | - wfRunHooks('GoogleNewsSitemap::Query', array($params, &$joins, &$conditions, &$tables)); |
| | 280 | + $joins = array(); |
| | 281 | + wfRunHooks('GoogleNewsSitemap::Query', array($params, &$joins, &$conditions)); |
| 281 | 282 | |
| 282 | 283 | switch ( $params['redirects'] ) { |
| 283 | 284 | case self::OPT_ONLY: |
| 284 | 285 | $conditions['page_is_redirect'] = 1; |
| 285 | | - break; |
| | 286 | + break; |
| 286 | 287 | case self::OPT_EXCLUDE: |
| 287 | 288 | $conditions['page_is_redirect'] = 0; |
| 288 | | - break; |
| | 289 | + break; |
| 289 | 290 | } |
| 290 | 291 | |
| 291 | 292 | if ( $params['hourCount'] > 0 |
| 292 | | - && $params['orderMethod'] !== 'lastedit' ) |
| 293 | | - { |
| | 293 | + && $params['orderMethod'] !== 'lastedit' ) { |
| 294 | 294 | // Limit to last X number of hours added to category, |
| 295 | 295 | // if hourcont is positive and we're sorting by |
| 296 | 296 | // category add date. |
| — | — | @@ -341,7 +341,6 @@ |
| 342 | 342 | $options['ORDER BY'] = 'c1.cl_timestamp ' . $sortOrder; |
| 343 | 343 | } |
| 344 | 344 | |
| 345 | | - |
| 346 | 345 | // earlier validation logic ensures this is a reasonable number |
| 347 | 346 | $options['LIMIT'] = $params['count']; |
| 348 | 347 | |
| — | — | @@ -354,7 +353,7 @@ |
| 355 | 354 | * variables that make up the request. |
| 356 | 355 | **/ |
| 357 | 356 | public function getParams() { |
| 358 | | - global $wgContLang, $wgRequest, $wgGNSMmaxCategories, |
| | 357 | + global $wgRequest, $wgGNSMmaxCategories, |
| 359 | 358 | $wgGNSMmaxResultCount, $wgGNSMfallbackCategory; |
| 360 | 359 | |
| 361 | 360 | $params = array(); |
| — | — | @@ -368,8 +367,7 @@ |
| 369 | 368 | $params['hourCount'] = $wgRequest->getInt( 'hourcount', -1 ); |
| 370 | 369 | |
| 371 | 370 | if ( ( $params['count'] > $wgGNSMmaxResultCount ) |
| 372 | | - || ( $params['count'] < 1 ) ) |
| 373 | | - { |
| | 371 | + || ( $params['count'] < 1 ) ) { |
| 374 | 372 | $params['count'] = $wgGNSMmaxResultCount; |
| 375 | 373 | } |
| 376 | 374 | |
| Index: branches/wmf/1.17wmf1/includes/parser/CoreParserFunctions.php |
| — | — | @@ -639,7 +639,7 @@ |
| 640 | 640 | } |
| 641 | 641 | |
| 642 | 642 | if ( $file ) { |
| 643 | | - $url = $file->getUrl(); |
| | 643 | + $url = $file->getFullUrl(); |
| 644 | 644 | |
| 645 | 645 | // If a size is requested... |
| 646 | 646 | if ( is_integer( $size ) ) { |
| Index: branches/wmf/1.17wmf1/includes/Linker.php |
| — | — | @@ -199,7 +199,7 @@ |
| 200 | 200 | |
| 201 | 201 | $attribs = array_merge( |
| 202 | 202 | $attribs, |
| 203 | | - $this->linkAttribs( $target, $customAttribs, $options, $text ) |
| | 203 | + $this->linkAttribs( $target, $customAttribs, $options ) |
| 204 | 204 | ); |
| 205 | 205 | if ( is_null( $text ) ) { |
| 206 | 206 | $text = $this->linkText( $target ); |
| — | — | @@ -249,7 +249,7 @@ |
| 250 | 250 | /** |
| 251 | 251 | * Returns the array of attributes used when linking to the Title $target |
| 252 | 252 | */ |
| 253 | | - private function linkAttribs( $target, $attribs, $options, $linkText ) { |
| | 253 | + private function linkAttribs( $target, $attribs, $options ) { |
| 254 | 254 | wfProfileIn( __METHOD__ ); |
| 255 | 255 | global $wgUser; |
| 256 | 256 | $defaults = array(); |
| — | — | @@ -280,13 +280,12 @@ |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | 283 | # Get a default title attribute. |
| 284 | | - $known = in_array( 'known', $options ); |
| 285 | 284 | if ( $target->getPrefixedText() == '' ) { |
| 286 | 285 | # A link like [[#Foo]]. This used to mean an empty title |
| 287 | 286 | # attribute, but that's silly. Just don't output a title. |
| 288 | | - } elseif ( $known && strtolower($linkText) !== strtolower($target->getPrefixedText() ) ) { |
| | 287 | + } elseif ( in_array( 'known', $options ) ) { |
| 289 | 288 | $defaults['title'] = $target->getPrefixedText(); |
| 290 | | - } elseif ( !$known ) { |
| | 289 | + } else { |
| 291 | 290 | $defaults['title'] = wfMsg( 'red-link-title', $target->getPrefixedText() ); |
| 292 | 291 | } |
| 293 | 292 | |
| Index: branches/wmf/1.17wmf1/includes/specials/SpecialIpblocklist.php |
| — | — | @@ -77,7 +77,7 @@ |
| 78 | 78 | $block = Block::newFromID( $this->id ); |
| 79 | 79 | $user = User::newFromName( $block->mAddress ); |
| 80 | 80 | } else { |
| 81 | | - $user = User::newFromName( $ip ); |
| | 81 | + $user = User::newFromName( $this->ip ); |
| 82 | 82 | } |
| 83 | 83 | $status = IPBlockForm::checkUnblockSelf( $user ); |
| 84 | 84 | if ( $status !== true ) { |
| Index: branches/wmf/1.17wmf1/resources/jquery/jquery.collapsibleTabs.js |
| — | — | @@ -49,12 +49,14 @@ |
| 50 | 50 | }, |
| 51 | 51 | addData: function( $collapsible ) { |
| 52 | 52 | var $settings = $collapsible.parent().data( 'collapsibleTabsSettings' ); |
| 53 | | - $collapsible.data( 'collapsibleTabsSettings', { |
| 54 | | - 'expandedContainer': $settings.expandedContainer, |
| 55 | | - 'collapsedContainer': $settings.collapsedContainer, |
| 56 | | - 'expandedWidth': $collapsible.width(), |
| 57 | | - 'prevElement': $collapsible.prev() |
| 58 | | - } ); |
| | 53 | + if ( $settings != null ) { |
| | 54 | + $collapsible.data( 'collapsibleTabsSettings', { |
| | 55 | + 'expandedContainer': $settings.expandedContainer, |
| | 56 | + 'collapsedContainer': $settings.collapsedContainer, |
| | 57 | + 'expandedWidth': $collapsible.width(), |
| | 58 | + 'prevElement': $collapsible.prev() |
| | 59 | + } ); |
| | 60 | + } |
| 59 | 61 | }, |
| 60 | 62 | getSettings: function( $collapsible ) { |
| 61 | 63 | var $settings = $collapsible.data( 'collapsibleTabsSettings' ); |
| — | — | @@ -95,7 +97,7 @@ |
| 96 | 98 | var dataExp = $.collapsibleTabs.getSettings( data.expandedContainer ); |
| 97 | 99 | dataExp.shifting = true; |
| 98 | 100 | $moving |
| 99 | | - .remove() |
| | 101 | + .detach() |
| 100 | 102 | .prependTo( data.collapsedContainer ) |
| 101 | 103 | .data( 'collapsibleTabsSettings', data ); |
| 102 | 104 | dataExp.shifting = false; |
| — | — | @@ -107,9 +109,9 @@ |
| 108 | 110 | var dataExp = $.collapsibleTabs.getSettings( data.expandedContainer ); |
| 109 | 111 | dataExp.shifting = true; |
| 110 | 112 | // remove this element from where it's at and put it in the dropdown menu |
| 111 | | - $moving.remove().insertAfter( data.prevElement ).data( 'collapsibleTabsSettings', data ); |
| | 113 | + $moving.detach().insertAfter( data.prevElement ).data( 'collapsibleTabsSettings', data ); |
| 112 | 114 | dataExp.shifting = false; |
| 113 | 115 | $.collapsibleTabs.handleResize(); |
| 114 | 116 | } |
| 115 | 117 | }; |
| 116 | | -} )( jQuery ); |
| \ No newline at end of file |
| | 118 | +} )( jQuery ); |
| Index: branches/wmf/1.17wmf1/resources/mediawiki/mediawiki.js |
| — | — | @@ -1004,9 +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://' |
| 1009 | | - || modules.substr( 0, 8 ) == 'https://' ) |
| 1010 | | - { |
| | 1008 | + if ( modules.substr( 0, 7 ) == 'http://' || modules.substr( 0, 8 ) == 'https://' ) { |
| 1011 | 1009 | if ( type === 'text/css' ) { |
| 1012 | 1010 | $( 'head' ) |
| 1013 | 1011 | .append( $( '<link rel="stylesheet" type="text/css" />' ) |
| Property changes on: branches/wmf/1.17wmf1/resources/mediawiki/mediawiki.js |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1014 | 1012 | Merged /trunk/phase3/resources/mediawiki/mediawiki.js:r85546,86450,86625,86788,86841,86904,87030 |
| 1015 | 1013 | Merged /branches/REL1_17/phase3/resources/mediawiki/mediawiki.js:r86409 |