| Index: branches/REL1_18/phase3/skins/vector/screen.css |
| — | — | @@ -216,7 +216,9 @@ |
| 217 | 217 | cursor: pointer; |
| 218 | 218 | } |
| 219 | 219 | div.vectorMenuFocus { |
| 220 | | - background-position: -22px 60%; |
| | 220 | + /* @embed */ |
| | 221 | + background-image: url(images/arrow-down-focus-icon.png); |
| | 222 | + background-position: 100% 60%; |
| 221 | 223 | } |
| 222 | 224 | /* @noflip */ |
| 223 | 225 | body.rtl div.vectorMenu { |
| Index: branches/REL1_18/phase3/includes/filerepo/File.php |
| — | — | @@ -674,7 +674,7 @@ |
| 675 | 675 | // Get the descriptionUrl to embed it as comment into the thumbnail. Bug 19791. |
| 676 | 676 | $descriptionUrl = $this->getDescriptionUrl(); |
| 677 | 677 | if ( $descriptionUrl ) { |
| 678 | | - $params['descriptionUrl'] = $wgServer . $descriptionUrl; |
| | 678 | + $params['descriptionUrl'] = wfExpandUrl( $descriptionUrl, PROTO_CANONICAL ); |
| 679 | 679 | } |
| 680 | 680 | |
| 681 | 681 | $script = $this->getTransformScript(); |
| Property changes on: branches/REL1_18/phase3/includes/filerepo/File.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 682 | 682 | Merged /trunk/phase3/includes/filerepo/File.php:r98990,99081-99082 |
| Index: branches/REL1_18/phase3/includes/specials/SpecialUndelete.php |
| — | — | @@ -399,6 +399,10 @@ |
| 400 | 400 | |
| 401 | 401 | # Does this page already exist? We'll have to update it... |
| 402 | 402 | $article = new Article( $this->title ); |
| | 403 | + # Load latest data for the current page (bug 31179) |
| | 404 | + $article->loadPageData( 'fromdbmaster' ); |
| | 405 | + $oldcountable = $article->isCountable(); |
| | 406 | + |
| 403 | 407 | $options = 'FOR UPDATE'; // lock page |
| 404 | 408 | $page = $dbw->selectRow( 'page', |
| 405 | 409 | array( 'page_id', 'page_latest' ), |
| — | — | @@ -532,7 +536,6 @@ |
| 533 | 537 | } |
| 534 | 538 | |
| 535 | 539 | $created = (bool)$newid; |
| 536 | | - $oldcountable = $article->isCountable(); |
| 537 | 540 | |
| 538 | 541 | // Attach the latest revision to the page... |
| 539 | 542 | $wasnew = $article->updateIfNewerOn( $dbw, $revision, $previousRevId ); |
| Index: branches/REL1_18/phase3/includes/specials/SpecialBlockList.php |
| — | — | @@ -244,7 +244,7 @@ |
| 245 | 245 | |
| 246 | 246 | switch( $name ) { |
| 247 | 247 | case 'ipb_timestamp': |
| 248 | | - $formatted = $wgLang->timeanddate( $value ); |
| | 248 | + $formatted = $this->getLang()->timeanddate( $value, /* User preference timezome */ true ); |
| 249 | 249 | break; |
| 250 | 250 | |
| 251 | 251 | case 'ipb_target': |
| — | — | @@ -270,8 +270,8 @@ |
| 271 | 271 | break; |
| 272 | 272 | |
| 273 | 273 | case 'ipb_expiry': |
| 274 | | - $formatted = $wgLang->formatExpiry( $value ); |
| 275 | | - if( $wgUser->isAllowed( 'block' ) ){ |
| | 274 | + $formatted = $this->getLang()->formatExpiry( $value, /* User preference timezome */ true ); |
| | 275 | + if( $this->getUser()->isAllowed( 'block' ) ){ |
| 276 | 276 | if( $row->ipb_auto ){ |
| 277 | 277 | $links[] = $sk->linkKnown( |
| 278 | 278 | SpecialPage::getTitleFor( 'Unblock' ), |
| Index: branches/REL1_18/phase3/includes/specials/SpecialEditWatchlist.php |
| — | — | @@ -459,7 +459,7 @@ |
| 460 | 460 | * @return HTMLForm |
| 461 | 461 | */ |
| 462 | 462 | protected function getRawForm(){ |
| 463 | | - $titles = implode( array_map( 'htmlspecialchars', $this->getWatchlist() ), "\n" ); |
| | 463 | + $titles = implode( $this->getWatchlist(), "\n" ); |
| 464 | 464 | $fields = array( |
| 465 | 465 | 'Titles' => array( |
| 466 | 466 | 'type' => 'textarea', |
| Index: branches/REL1_18/phase3/includes/specials/SpecialContributions.php |
| — | — | @@ -338,7 +338,7 @@ |
| 339 | 339 | * @return String: HTML fragment |
| 340 | 340 | */ |
| 341 | 341 | protected function getForm() { |
| 342 | | - global $wgScript, $wgMiserMode; |
| | 342 | + global $wgScript; |
| 343 | 343 | |
| 344 | 344 | $this->opts['title'] = $this->getTitle()->getPrefixedText(); |
| 345 | 345 | if( !isset( $this->opts['target'] ) ) { |
| — | — | @@ -388,12 +388,6 @@ |
| 389 | 389 | |
| 390 | 390 | $tagFilter = ChangeTags::buildTagFilterSelector( $this->opts['tagFilter'] ); |
| 391 | 391 | |
| 392 | | - $fNS = ( $wgMiserMode ) ? '' : |
| 393 | | - Html::rawElement( 'span', array( 'style' => 'white-space: nowrap' ), |
| 394 | | - Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' . |
| 395 | | - Xml::namespaceSelector( $this->opts['namespace'], '' ) |
| 396 | | - ); |
| 397 | | - |
| 398 | 392 | $f .= Xml::fieldset( wfMsg( 'sp-contributions-search' ) ) . |
| 399 | 393 | Xml::radioLabel( wfMsgExt( 'sp-contributions-newbies', array( 'parsemag' ) ), |
| 400 | 394 | 'contribs', 'newbie' , 'newbie', $this->opts['contribs'] == 'newbie' ) . '<br />' . |
| — | — | @@ -403,7 +397,10 @@ |
| 404 | 398 | 'size' => '20', |
| 405 | 399 | 'required' => '' |
| 406 | 400 | ) + ( $this->opts['target'] ? array() : array( 'autofocus' ) ) ) . ' '. |
| 407 | | - $fNS. |
| | 401 | + Html::rawElement( 'span', array( 'style' => 'white-space: nowrap' ), |
| | 402 | + Xml::label( wfMsg( 'namespace' ), 'namespace' ) . ' ' . |
| | 403 | + Xml::namespaceSelector( $this->opts['namespace'], '' ) |
| | 404 | + ) . |
| 408 | 405 | Xml::checkLabel( wfMsg( 'history-show-deleted' ), |
| 409 | 406 | 'deletedOnly', 'mw-show-deleted-only', $this->opts['deletedOnly'] ) . '<br />' . |
| 410 | 407 | Xml::tags( 'p', null, Xml::checkLabel( wfMsg( 'sp-contributions-toponly' ), |
| — | — | @@ -531,8 +528,7 @@ |
| 532 | 529 | } |
| 533 | 530 | |
| 534 | 531 | function getNamespaceCond() { |
| 535 | | - global $wgMiserMode; |
| 536 | | - if( $this->namespace !== '' && !$wgMiserMode ) { |
| | 532 | + if( $this->namespace !== '' ) { |
| 537 | 533 | return array( 'page_namespace' => (int)$this->namespace ); |
| 538 | 534 | } else { |
| 539 | 535 | return array(); |
| Property changes on: branches/REL1_18/phase3/includes/specials |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 540 | 536 | Merged /trunk/phase3/includes/specials:r98927,98990,99081-99082,99102,99104,99126 |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 541 | 537 | Merged /trunk/phase3/includes:r98927,98990,99081-99082,99102,99104,99126 |
| Index: branches/REL1_18/phase3/languages/Language.php |
| — | — | @@ -3423,7 +3423,7 @@ |
| 3424 | 3424 | : $infinity; |
| 3425 | 3425 | } else { |
| 3426 | 3426 | return $format === true |
| 3427 | | - ? $this->timeanddate( $expiry ) |
| | 3427 | + ? $this->timeanddate( $expiry, /* User preference timezome */ true ) |
| 3428 | 3428 | : wfTimestamp( $format, $expiry ); |
| 3429 | 3429 | } |
| 3430 | 3430 | } |
| Property changes on: branches/REL1_18/phase3/languages |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 3431 | 3431 | Merged /trunk/phase3/languages:r99081-99082 |
| Index: branches/REL1_18/phase3/resources/jquery/jquery.tablesorter.css |
| — | — | @@ -1,5 +1,6 @@ |
| 2 | 2 | /* Table Sorting */ |
| 3 | 3 | table.jquery-tablesorter th.headerSort { |
| | 4 | + /* @embed */ |
| 4 | 5 | background-image: url(images/sort_both.gif); |
| 5 | 6 | cursor: pointer; |
| 6 | 7 | background-repeat: no-repeat; |
| — | — | @@ -7,8 +8,10 @@ |
| 8 | 9 | padding-right: 21px; |
| 9 | 10 | } |
| 10 | 11 | table.jquery-tablesorter th.headerSortUp { |
| | 12 | + /* @embed */ |
| 11 | 13 | background-image: url(images/sort_up.gif); |
| 12 | 14 | } |
| 13 | 15 | table.jquery-tablesorter th.headerSortDown { |
| | 16 | + /* @embed */ |
| 14 | 17 | background-image: url(images/sort_down.gif); |
| 15 | 18 | } |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 16 | 19 | Merged /trunk/phase3:r98927,98990,99081-99082,99091,99102,99104,99126 |