| Index: branches/REL1_18/phase3/includes/SpecialPageFactory.php |
| — | — | @@ -339,11 +339,9 @@ |
| 340 | 340 | $pages = array(); |
| 341 | 341 | foreach ( self::getList() as $name => $rec ) { |
| 342 | 342 | $page = self::getPage( $name ); |
| 343 | | - if ( $page->isListed() |
| 344 | | - && ( |
| 345 | | - !$page->isRestricted() |
| 346 | | - || $page->userCanExecute( $wgUser ) |
| 347 | | - ) |
| | 343 | + if ( $page // not null |
| | 344 | + && $page->isListed() |
| | 345 | + && ( !$page->isRestricted() || $page->userCanExecute( $wgUser ) ) |
| 348 | 346 | ) { |
| 349 | 347 | $pages[$name] = $page; |
| 350 | 348 | } |
| Property changes on: branches/REL1_18/phase3/includes/SpecialPageFactory.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 351 | 349 | Merged /trunk/phase3/includes/SpecialPageFactory.php:r99286,99332,100398,100701,101010 |
| Index: branches/REL1_18/phase3/includes/CategoryPage.php |
| — | — | @@ -68,14 +68,27 @@ |
| 69 | 69 | // Use these as defaults for back compat --catrope |
| 70 | 70 | $oldFrom = $wgRequest->getVal( 'from' ); |
| 71 | 71 | $oldUntil = $wgRequest->getVal( 'until' ); |
| | 72 | + |
| | 73 | + $reqArray = $wgRequest->getValues(); |
| 72 | 74 | |
| 73 | 75 | $from = $until = array(); |
| 74 | 76 | foreach ( array( 'page', 'subcat', 'file' ) as $type ) { |
| 75 | 77 | $from[$type] = $wgRequest->getVal( "{$type}from", $oldFrom ); |
| 76 | 78 | $until[$type] = $wgRequest->getVal( "{$type}until", $oldUntil ); |
| | 79 | + |
| | 80 | + // Do not want old-style from/until propagating in nav links. |
| | 81 | + if ( !isset( $reqArray["{$type}from"] ) && isset( $reqArray["from"] ) ) { |
| | 82 | + $reqArray["{$type}from"] = $reqArray["from"]; |
| | 83 | + } |
| | 84 | + if ( !isset( $reqArray["{$type}to"] ) && isset( $reqArray["to"] ) ) { |
| | 85 | + $reqArray["{$type}to"] = $reqArray["to"]; |
| | 86 | + } |
| 77 | 87 | } |
| 78 | 88 | |
| 79 | | - $viewer = new $this->mCategoryViewerClass( $this->mTitle, $from, $until, $wgRequest->getValues() ); |
| | 89 | + unset( $reqArray["from"] ); |
| | 90 | + unset( $reqArray["to"] ); |
| | 91 | + |
| | 92 | + $viewer = new $this->mCategoryViewerClass( $this->mTitle, $from, $until, $reqArray ); |
| 80 | 93 | $wgOut->addHTML( $viewer->getHTML() ); |
| 81 | 94 | } |
| 82 | 95 | } |
| Property changes on: branches/REL1_18/phase3/includes/CategoryPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 83 | 96 | Merged /trunk/phase3/includes/CategoryPage.php:r99332,100398,100701,101010 |
| Index: branches/REL1_18/phase3/includes/Import.php |
| — | — | @@ -1286,7 +1286,7 @@ |
| 1287 | 1287 | # quicker and sorts out user-agent problems which might |
| 1288 | 1288 | # otherwise prevent importing from large sites, such |
| 1289 | 1289 | # as the Wikimedia cluster, etc. |
| 1290 | | - $data = Http::request( $method, $url ); |
| | 1290 | + $data = Http::request( $method, $url, array( 'followRedirects' => true ) ); |
| 1291 | 1291 | if( $data !== false ) { |
| 1292 | 1292 | $file = tmpfile(); |
| 1293 | 1293 | fwrite( $file, $data ); |
| Property changes on: branches/REL1_18/phase3/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1294 | 1294 | Merged /trunk/phase3/includes:r99286,99332,100398,100701,101010 |
| Index: branches/REL1_18/phase3/resources/jquery/jquery.textSelection.js |
| — | — | @@ -205,12 +205,20 @@ |
| 206 | 206 | * Get the position (in resolution of bytes not nessecarily characters) |
| 207 | 207 | * in a textarea |
| 208 | 208 | * |
| | 209 | + * Will focus the textarea in some browsers (IE/Opera) |
| | 210 | + * |
| 209 | 211 | * @fixme document the options parameters |
| 210 | 212 | */ |
| 211 | 213 | getCaretPosition: function( options ) { |
| 212 | 214 | function getCaret( e ) { |
| 213 | 215 | var caretPos = 0, endPos = 0; |
| 214 | 216 | if ( $.browser.msie ) { |
| | 217 | + // IE doesn't properly report non-selected caret position through |
| | 218 | + // the selection ranges when textarea isn't focused. This can |
| | 219 | + // lead to saving a bogus empty selection, which then screws up |
| | 220 | + // whatever we do later (bug 31847). |
| | 221 | + e.focus(); |
| | 222 | + |
| 215 | 223 | // IE Support |
| 216 | 224 | var preFinished = false; |
| 217 | 225 | var periFinished = false; |
| Index: branches/REL1_18/phase3/resources/jquery/jquery.tablesorter.js |
| — | — | @@ -584,8 +584,13 @@ |
| 585 | 585 | cacheRegexs(); |
| 586 | 586 | |
| 587 | 587 | // Apply event handling to headers |
| 588 | | - // this is to big, perhaps break it out? |
| | 588 | + // this is too big, perhaps break it out? |
| 589 | 589 | $headers.click( function( e ) { |
| | 590 | + if ( e.target.nodeName.toLowerCase() == 'a' ) { |
| | 591 | + // The user clicked on a link inside a table header |
| | 592 | + // Do nothing and let the default link click action continue |
| | 593 | + return true; |
| | 594 | + } |
| 590 | 595 | |
| 591 | 596 | if ( firstTime ) { |
| 592 | 597 | firstTime = false; |
| — | — | @@ -667,12 +672,7 @@ |
| 668 | 673 | }; |
| 669 | 674 | return false; |
| 670 | 675 | } |
| 671 | | - } ) |
| 672 | | - // Allow links in headers to be clicked |
| 673 | | - .find( 'a' ).click( function( e ) { |
| 674 | | - e.stopPropagation(); |
| 675 | 676 | } ); |
| 676 | | - |
| 677 | 677 | } ); |
| 678 | 678 | }, |
| 679 | 679 | |
| Property changes on: branches/REL1_18/phase3 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 680 | 680 | Merged /trunk/phase3:r99286,99332,100398,100701,101010 |