| Index: branches/wmf/1.17wmf1/skins/common/wikibits.js |
| — | — | @@ -387,16 +387,18 @@ |
| 388 | 388 | }; |
| 389 | 389 | |
| 390 | 390 | window.getInnerText = function( el ) { |
| 391 | | - if ( el.getAttribute( 'data-sort-value' ) !== null ) { |
| 392 | | - return el.getAttribute( 'data-sort-value' ); |
| 393 | | - } |
| 394 | | - |
| 395 | 391 | if ( typeof el == 'string' ) { |
| 396 | 392 | return el; |
| 397 | 393 | } |
| 398 | 394 | if ( typeof el == 'undefined' ) { |
| 399 | 395 | return el; |
| 400 | 396 | } |
| | 397 | + // Custom sort value through 'data-sort-value' attribute |
| | 398 | + // (no need to prepend hidden text to change sort value) |
| | 399 | + if ( el.nodeType && el.getAttribute( 'data-sort-value' ) !== null ) { |
| | 400 | + // Make sure it's a valid DOM element (.nodeType) and that the attribute is set (!null) |
| | 401 | + return el.getAttribute( 'data-sort-value' ); |
| | 402 | + } |
| 401 | 403 | if ( el.textContent ) { |
| 402 | 404 | return el.textContent; // not needed but it is faster |
| 403 | 405 | } |
| Index: branches/wmf/1.17wmf1/extensions/Collection/Collection.php |
| — | — | @@ -187,6 +187,7 @@ |
| 188 | 188 | ), |
| 189 | 189 | 'ext.collection.checkLoadFromLocalStorage' => $collResourceTemplate + array( |
| 190 | 190 | 'scripts' => 'check_load_from_localstorage.js', |
| | 191 | + 'styles' => 'bookcreator.css', |
| 191 | 192 | 'dependencies' => 'ext.collection.jquery.jstorage' |
| 192 | 193 | ) |
| 193 | 194 | ); |
| Index: branches/wmf/1.17wmf1/extensions/ProofreadPage/ProofreadPage_body.php |
| — | — | @@ -975,8 +975,8 @@ |
| 976 | 976 | if( !preg_match( $page_regexp, $text, $m ) ) { |
| 977 | 977 | $this->load_index( $wgTitle ); |
| 978 | 978 | list( $index_title, $prev_title, $next_title, $header, $footer, $css, $edit_width ) = $this->navigation( $wgTitle ); |
| 979 | | - $new_text = "<noinclude><pagequality level=\"1\" user=\"$username\" />" |
| 980 | | - ."$header\n\n\n</noinclude>$text<noinclude>\n$footer</noinclude>"; |
| | 979 | + $new_text = "<noinclude><pagequality level=\"1\" user=\"$username\" /><div class=\"pagetext\">" |
| | 980 | + ."$header\n\n\n</noinclude>$text<noinclude>\n$footer</div></noinclude>"; |
| 981 | 981 | return array( -1, null, $new_text ); |
| 982 | 982 | } |
| 983 | 983 | |
| Property changes on: branches/wmf/1.17wmf1/extensions/ProofreadPage/ProofreadPage_body.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 984 | 984 | Merged /trunk/extensions/ProofreadPage/ProofreadPage_body.php:r82574,82601,82654 |
| 985 | 985 | Merged /trunk/phase3/extensions/ProofreadPage/ProofreadPage_body.php:r82473,82572,82608 |
| Index: branches/wmf/1.17wmf1/extensions/CodeReview/ui/CodeCommentsListView.php |
| — | — | @@ -67,7 +67,7 @@ |
| 68 | 68 | switch( $name ) { |
| 69 | 69 | case 'cc_rev_id': |
| 70 | 70 | return $this->mView->skin->link( |
| 71 | | - SpecialPage::getTitleFor( 'Code', $this->mRepo->getName() . '/' . $value . '#code-comments' ), |
| | 71 | + SpecialPage::getSafeTitleFor( 'Code', $this->mRepo->getName() . '/' . $value . '#code-comments' ), |
| 72 | 72 | htmlspecialchars( $value ) ); |
| 73 | 73 | case 'cr_status': |
| 74 | 74 | return $this->mView->skin->link( |
| Index: branches/wmf/1.17wmf1/includes/parser/Parser.php |
| — | — | @@ -320,8 +320,8 @@ |
| 321 | 321 | |
| 322 | 322 | /** |
| 323 | 323 | * A converted title will be provided in the output object if title and |
| 324 | | - * content conversion are enabled, the article text does not contain |
| 325 | | - * a conversion-suppressing double-underscore tag, and no |
| | 324 | + * content conversion are enabled, the article text does not contain |
| | 325 | + * a conversion-suppressing double-underscore tag, and no |
| 326 | 326 | * {{DISPLAYTITLE:...}} is present. DISPLAYTITLE takes precedence over |
| 327 | 327 | * automatic link conversion. |
| 328 | 328 | */ |
| — | — | @@ -478,7 +478,9 @@ |
| 479 | 479 | |
| 480 | 480 | $flags = PPFrame::NO_ARGS | PPFrame::NO_TEMPLATES; |
| 481 | 481 | $dom = $this->preprocessToDom( $text, self::PTD_FOR_INCLUSION ); |
| 482 | | - return $this->getPreprocessor()->newFrame()->expand( $dom, $flags ); |
| | 482 | + $text = $this->getPreprocessor()->newFrame()->expand( $dom, $flags ); |
| | 483 | + $text = $this->mStripState->unstripBoth( $text ); |
| | 484 | + return $text; |
| 483 | 485 | } |
| 484 | 486 | |
| 485 | 487 | /** |
| Property changes on: branches/wmf/1.17wmf1/includes/parser/Parser.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 486 | 488 | Merged /trunk/phase3/includes/parser/Parser.php:r82473,82572,82608 |
| Index: branches/wmf/1.17wmf1/languages/messages/MessagesPt.php |
| — | — | @@ -81,7 +81,7 @@ |
| 82 | 82 | ); |
| 83 | 83 | |
| 84 | 84 | $separatorTransformTable = array( ',' => ' ', '.' => ',' ); |
| 85 | | -$linkTrail = '/^([áâãàéêçíóôõúüa-z]+)(.*)$/sDu'; # Bug 21168 |
| | 85 | +$linkTrail = '/^([áâãàéêẽçíòóôõq̃úüűũa-z]+)(.*)$/sDu'; # Bug 21168, 27633 |
| 86 | 86 | |
| 87 | 87 | $specialPageAliases = array( |
| 88 | 88 | 'DoubleRedirects' => array( 'Redireccionamentos_duplos', 'Redirecionamentos_duplos' ), |
| Index: branches/wmf/1.17wmf1/RELEASE-NOTES |
| — | — | @@ -619,6 +619,8 @@ |
| 620 | 620 | * Minangkabau (min) (new) |
| 621 | 621 | * Dutch (informal) (nl-informal) (new) |
| 622 | 622 | * Rusyn (rue) (new) |
| | 623 | +* Link trail added for sl and sh |
| | 624 | +* (bug 27633) Add characters to linkTrail for Potuguese (pt and pt-br) |
| 623 | 625 | |
| 624 | 626 | * (bug 23156) Commafy and search normalization updated for Belarusian |
| 625 | 627 | (Taraškievica). |
| Property changes on: branches/wmf/1.17wmf1/RELEASE-NOTES |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 626 | 628 | Merged /trunk/phase3/RELEASE-NOTES:r82473,82572,82608 |