| Index: branches/wmf/1.18wmf1/skins/common/shared.css |
| — | — | @@ -794,20 +794,6 @@ |
| 795 | 795 | right: 10px; |
| 796 | 796 | background-position: 0% 100%; |
| 797 | 797 | } |
| 798 | | -/* Table Sorting */ |
| 799 | | -th.headerSort { |
| 800 | | - background-image: url(images/sort_both.gif); |
| 801 | | - cursor: pointer; |
| 802 | | - background-repeat: no-repeat; |
| 803 | | - background-position: center right; |
| 804 | | - padding-right: 21px; |
| 805 | | -} |
| 806 | | -th.headerSortUp { |
| 807 | | - background-image: url(images/sort_up.gif); |
| 808 | | -} |
| 809 | | -th.headerSortDown { |
| 810 | | - background-image: url(images/sort_down.gif); |
| 811 | | -} |
| 812 | 798 | |
| 813 | 799 | /* LTR content in RTL layout */ |
| 814 | 800 | .ltr { |
| Index: branches/wmf/1.18wmf1/skins/common/images/sort_up.gif |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/gif |
| Index: branches/wmf/1.18wmf1/skins/common/images/sort_down.gif |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/gif |
| Index: branches/wmf/1.18wmf1/skins/common/images/sort_none.gif |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/gif |
| Index: branches/wmf/1.18wmf1/skins/common/images/sort_both.gif |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/gif |
| Index: branches/wmf/1.18wmf1/includes/SpecialPageFactory.php |
| — | — | @@ -444,7 +444,7 @@ |
| 445 | 445 | wfProfileOut( __METHOD__ ); |
| 446 | 446 | return $title; |
| 447 | 447 | } else { |
| 448 | | - $context->setTitle( $page->getTitle() ); |
| | 448 | + $context->setTitle( $page->getTitle( $par ) ); |
| 449 | 449 | } |
| 450 | 450 | |
| 451 | 451 | } elseif ( !$page->isIncludable() ) { |
| Property changes on: branches/wmf/1.18wmf1/includes/SpecialPageFactory.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 452 | 452 | Merged /trunk/phase3/includes/SpecialPageFactory.php:r98235,98411,98665,98676,98678,98773,98812,99082,99091-99092 |
| Index: branches/wmf/1.18wmf1/includes/api/ApiQueryQueryPage.php |
| — | — | @@ -104,7 +104,7 @@ |
| 105 | 105 | return; |
| 106 | 106 | } |
| 107 | 107 | |
| 108 | | - $res = $qp->doQuery( $params['limit'] + 1, $params['offset'] ); |
| | 108 | + $res = $qp->doQuery( $params['offset'], $params['limit'] + 1 ); |
| 109 | 109 | $count = 0; |
| 110 | 110 | $titles = array(); |
| 111 | 111 | foreach ( $res as $row ) { |
| Index: branches/wmf/1.18wmf1/includes/media/Tiff.php |
| — | — | @@ -17,13 +17,18 @@ |
| 18 | 18 | * Conversion to PNG for inline display can be disabled here... |
| 19 | 19 | * Note scaling should work with ImageMagick, but may not with GD scaling. |
| 20 | 20 | * |
| | 21 | + * Files pulled from an another MediaWiki instance via ForeignAPIRepo / |
| | 22 | + * InstantCommons will have thumbnails managed from the remote instance, |
| | 23 | + * so we can skip this check. |
| | 24 | + * |
| 21 | 25 | * @param $file |
| 22 | 26 | * |
| 23 | 27 | * @return bool |
| 24 | 28 | */ |
| 25 | 29 | function canRender( $file ) { |
| 26 | 30 | global $wgTiffThumbnailType; |
| 27 | | - return (bool)$wgTiffThumbnailType; |
| | 31 | + return (bool)$wgTiffThumbnailType |
| | 32 | + || ($file->getRepo() instanceof ForeignAPIRepo); |
| 28 | 33 | } |
| 29 | 34 | |
| 30 | 35 | /** |
| Index: branches/wmf/1.18wmf1/includes/specials/SpecialBlockList.php |
| — | — | @@ -245,7 +245,7 @@ |
| 246 | 246 | |
| 247 | 247 | switch( $name ) { |
| 248 | 248 | case 'ipb_timestamp': |
| 249 | | - $formatted = $wgLang->timeanddate( $value ); |
| | 249 | + $formatted = $wgLang->timeanddate( $value, /* User preference timezome */ true ); |
| 250 | 250 | break; |
| 251 | 251 | |
| 252 | 252 | case 'ipb_target': |
| — | — | @@ -271,7 +271,7 @@ |
| 272 | 272 | break; |
| 273 | 273 | |
| 274 | 274 | case 'ipb_expiry': |
| 275 | | - $formatted = $wgLang->formatExpiry( $value ); |
| | 275 | + $formatted = $wgLang->formatExpiry( $value, /* User preference timezome */ true ); |
| 276 | 276 | if( $wgUser->isAllowed( 'block' ) ){ |
| 277 | 277 | if( $row->ipb_auto ){ |
| 278 | 278 | $links[] = $sk->linkKnown( |
| Property changes on: branches/wmf/1.18wmf1/includes/specials/SpecialBlockList.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 279 | 279 | Merged /trunk/phase3/includes/specials/SpecialBlockList.php:r98235,98411,98665,98676,98678,98773,98812,99082,99091-99092 |
| Index: branches/wmf/1.18wmf1/includes/QueryPage.php |
| — | — | @@ -423,7 +423,7 @@ |
| 424 | 424 | } |
| 425 | 425 | |
| 426 | 426 | public function getCachedTimestamp() { |
| 427 | | - if ( !is_null( $this->cachedTimestamp ) ) { |
| | 427 | + if ( is_null( $this->cachedTimestamp ) ) { |
| 428 | 428 | $dbr = wfGetDB( DB_SLAVE ); |
| 429 | 429 | $fname = get_class( $this ) . '::getCachedTimestamp'; |
| 430 | 430 | $this->cachedTimestamp = $dbr->selectField( 'querycache_info', 'qci_timestamp', |
| Index: branches/wmf/1.18wmf1/languages/Language.php |
| — | — | @@ -3463,7 +3463,7 @@ |
| 3464 | 3464 | : $infinity; |
| 3465 | 3465 | } else { |
| 3466 | 3466 | return $format === true |
| 3467 | | - ? $this->timeanddate( $expiry ) |
| | 3467 | + ? $this->timeanddate( $expiry, /* User preference timezome */ true ) |
| 3468 | 3468 | : wfTimestamp( $format, $expiry ); |
| 3469 | 3469 | } |
| 3470 | 3470 | } |
| Index: branches/wmf/1.18wmf1/resources/jquery/jquery.tablesorter.css |
| — | — | @@ -0,0 +1,17 @@ |
| | 2 | +/* Table Sorting */ |
| | 3 | +table.jquery-tablesorter th.headerSort { |
| | 4 | + /* @embed */ |
| | 5 | + background-image: url(images/sort_both.gif); |
| | 6 | + cursor: pointer; |
| | 7 | + background-repeat: no-repeat; |
| | 8 | + background-position: center right; |
| | 9 | + padding-right: 21px; |
| | 10 | +} |
| | 11 | +table.jquery-tablesorter th.headerSortUp { |
| | 12 | + /* @embed */ |
| | 13 | + background-image: url(images/sort_up.gif); |
| | 14 | +} |
| | 15 | +table.jquery-tablesorter th.headerSortDown { |
| | 16 | + /* @embed */ |
| | 17 | + background-image: url(images/sort_down.gif); |
| | 18 | +} |
| Property changes on: branches/wmf/1.18wmf1/resources/jquery/jquery.tablesorter.css |
| ___________________________________________________________________ |
| Added: svn:eol-style |
| 1 | 19 | + native |
| Index: branches/wmf/1.18wmf1/resources/jquery/images/sort_up.gif |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/gif |
| Property changes on: branches/wmf/1.18wmf1/resources/jquery/images/sort_up.gif |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 2 | 20 | + image/gif |
| Index: branches/wmf/1.18wmf1/resources/jquery/images/sort_down.gif |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/gif |
| Property changes on: branches/wmf/1.18wmf1/resources/jquery/images/sort_down.gif |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 3 | 21 | + image/gif |
| Index: branches/wmf/1.18wmf1/resources/jquery/images/sort_both.gif |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/gif |
| Property changes on: branches/wmf/1.18wmf1/resources/jquery/images/sort_both.gif |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 4 | 22 | + image/gif |
| Index: branches/wmf/1.18wmf1/resources/jquery/images/sort_none.gif |
| Cannot display: file marked as a binary type. |
| svn:mime-type = image/gif |
| Property changes on: branches/wmf/1.18wmf1/resources/jquery/images/sort_none.gif |
| ___________________________________________________________________ |
| Added: svn:mime-type |
| 5 | 23 | + image/gif |
| Property changes on: branches/wmf/1.18wmf1/resources/jquery/images |
| ___________________________________________________________________ |
| Added: svn:mergeinfo |
| 6 | 24 | Merged /trunk/phase3/resources/jquery/images:r98665 |
| Index: branches/wmf/1.18wmf1/resources/jquery/jquery.tablesorter.js |
| — | — | @@ -424,7 +424,7 @@ |
| 425 | 425 | |
| 426 | 426 | function explodeRowspans( $table ) { |
| 427 | 427 | // Split multi row cells into multiple cells with the same content |
| 428 | | - $table.find( '[rowspan]' ).each(function() { |
| | 428 | + $table.find( 'tbody [rowspan]' ).each(function() { |
| 429 | 429 | var rowSpan = this.rowSpan; |
| 430 | 430 | this.rowSpan = 1; |
| 431 | 431 | var cell = $( this ); |
| — | — | @@ -539,6 +539,7 @@ |
| 540 | 540 | return; |
| 541 | 541 | } |
| 542 | 542 | } |
| | 543 | + $table.addClass( "jquery-tablesorter" ); |
| 543 | 544 | |
| 544 | 545 | // New config object. |
| 545 | 546 | table.config = {}; |
| Index: branches/wmf/1.18wmf1/resources/Resources.php |
| — | — | @@ -161,6 +161,7 @@ |
| 162 | 162 | ), |
| 163 | 163 | 'jquery.tablesorter' => array( |
| 164 | 164 | 'scripts' => 'resources/jquery/jquery.tablesorter.js', |
| | 165 | + 'styles' => 'resources/jquery/jquery.tablesorter.css', |
| 165 | 166 | 'messages' => array( 'sort-descending', 'sort-ascending' ), |
| 166 | 167 | ), |
| 167 | 168 | 'jquery.textSelection' => array( |