| Index: branches/liquidthreads/maintenance/language/messages.inc |
| — | — | @@ -526,6 +526,7 @@ |
| 527 | 527 | 'currentrev', |
| 528 | 528 | 'revisionasof', |
| 529 | 529 | 'revision-info', |
| | 530 | + 'revision-info-current', |
| 530 | 531 | 'revision-nav', |
| 531 | 532 | 'previousrevision', |
| 532 | 533 | 'nextrevision', |
| Index: branches/liquidthreads/maintenance/language/messageTypes.inc |
| — | — | @@ -86,6 +86,7 @@ |
| 87 | 87 | 'pubmedurl', |
| 88 | 88 | 'randompage-url', |
| 89 | 89 | 'recentchanges-url', |
| | 90 | + 'revision-info-current', |
| 90 | 91 | 'revision-nav', |
| 91 | 92 | 'rfcurl', |
| 92 | 93 | 'shareddescriptionfollows', |
| Index: branches/liquidthreads/includes/ParserOutput.php |
| — | — | @@ -16,7 +16,6 @@ |
| 17 | 17 | $mTemplates, # 2-D map of NS/DBK to ID for the template references. ID=zero for broken. |
| 18 | 18 | $mTemplateIds, # 2-D map of NS/DBK to rev ID for the template references. ID=zero for broken. |
| 19 | 19 | $mImages, # DB keys of the images used, in the array key only |
| 20 | | - $mImageTimestamps, # Map of DBK to rev ID for the template references. ID=zero for broken. |
| 21 | 20 | $mExternalLinks, # External link URLs, in the key only |
| 22 | 21 | $mHTMLtitle, # Display HTML title |
| 23 | 22 | $mSubtitle, # Additional subtitle |
| — | — | @@ -44,7 +43,6 @@ |
| 45 | 44 | $this->mNoGallery = false; |
| 46 | 45 | $this->mHeadItems = array(); |
| 47 | 46 | $this->mTemplateIds = array(); |
| 48 | | - $this->mImageTimestamps = array(); |
| 49 | 47 | } |
| 50 | 48 | |
| 51 | 49 | function getText() { return $this->mText; } |
| — | — | @@ -92,19 +90,8 @@ |
| 93 | 91 | $this->mLinks[$ns][$dbk] = $id; |
| 94 | 92 | } |
| 95 | 93 | |
| 96 | | - function addImage( $name, $timestamp=NULL ) { |
| 97 | | - if( isset($this->mImages[$name]) ) |
| 98 | | - return; // No repeated pointless DB calls! |
| | 94 | + function addImage( $name ) { |
| 99 | 95 | $this->mImages[$name] = 1; |
| 100 | | - if( is_null($timestamp) ) { |
| 101 | | - wfProfileIn( __METHOD__ ); |
| 102 | | - $dbr = wfGetDB(DB_SLAVE); |
| 103 | | - $timestamp = $dbr->selectField('image', 'img_timestamp', |
| 104 | | - array('img_name' => $name), |
| 105 | | - __METHOD__ ); |
| 106 | | - } |
| 107 | | - $timestamp = $timestamp ? $timestamp : null; |
| 108 | | - $this->mImageTimestamps[$name] = $timestamp; // For versioning |
| 109 | 96 | } |
| 110 | 97 | |
| 111 | 98 | function addTemplate( $title, $page_id, $rev_id ) { |
| Index: branches/liquidthreads/includes/Article.php |
| — | — | @@ -2424,7 +2424,12 @@ |
| 2425 | 2425 | $userlinks = $sk->userLink( $revision->getUser(), $revision->getUserText() ) |
| 2426 | 2426 | . $sk->userToolLinks( $revision->getUser(), $revision->getUserText() ); |
| 2427 | 2427 | |
| 2428 | | - $r = "\n\t\t\t\t<div id=\"mw-revision-info\">" . wfMsg( 'revision-info', $td, $userlinks ) . "</div>\n" . |
| | 2428 | + $m = wfMsg( 'revision-info-current' ); |
| | 2429 | + $infomsg = $current && !wfEmptyMsg( 'revision-info-current', $m ) && $m != '-' |
| | 2430 | + ? 'revision-info-current' |
| | 2431 | + : 'revision-info'; |
| | 2432 | + |
| | 2433 | + $r = "\n\t\t\t\t<div id=\"mw-{$infomsg}\">" . wfMsg( $infomsg, $td, $userlinks ) . "</div>\n" . |
| 2429 | 2434 | "\n\t\t\t\t<div id=\"mw-revision-nav\">" . wfMsg( 'revision-nav', $prevdiff, $prevlink, $lnk, $curdiff, $nextlink, $nextdiff ) . "</div>\n\t\t\t"; |
| 2430 | 2435 | $wgOut->setSubtitle( $r ); |
| 2431 | 2436 | } |
| Index: branches/liquidthreads/includes/ImagePage.php |
| — | — | @@ -672,9 +672,6 @@ |
| 673 | 673 | return; |
| 674 | 674 | } |
| 675 | 675 | |
| 676 | | - # Record upload and update metadata cache |
| 677 | | - $this->img->recordUpload( $result, wfMsg( "reverted" ) ); |
| 678 | | - |
| 679 | 676 | $wgOut->setPagetitle( wfMsg( 'actioncomplete' ) ); |
| 680 | 677 | $wgOut->setRobotpolicy( 'noindex,nofollow' ); |
| 681 | 678 | $wgOut->addHTML( wfMsg( 'imagereverted' ) ); |
| Index: branches/liquidthreads/includes/SpecialUpload.php |
| — | — | @@ -725,7 +725,7 @@ |
| 726 | 726 | $summary = wfMsgWikiHtml( 'fileuploadsummary' ); |
| 727 | 727 | |
| 728 | 728 | $licenses = new Licenses(); |
| 729 | | - $license = wfMsgHtml( 'license' ); |
| | 729 | + $license = wfMsgExt( 'license', array( 'parseinline' ) ); |
| 730 | 730 | $nolicense = wfMsgHtml( 'nolicense' ); |
| 731 | 731 | $licenseshtml = $licenses->getHtml(); |
| 732 | 732 | |
| Index: branches/liquidthreads/includes/OutputPage.php |
| — | — | @@ -55,7 +55,6 @@ |
| 56 | 56 | $this->mRevisionId = null; |
| 57 | 57 | $this->mNewSectionLink = false; |
| 58 | 58 | $this->mTemplateIds = array(); |
| 59 | | - $this->mImageTimestamps = array(); |
| 60 | 59 | } |
| 61 | 60 | |
| 62 | 61 | public function redirect( $url, $responsecode = '302' ) { |
| — | — | @@ -391,7 +390,6 @@ |
| 392 | 391 | $this->mHeadItems = array_merge( $this->mHeadItems, (array)$parserOutput->mHeadItems ); |
| 393 | 392 | // Versioning... |
| 394 | 393 | $this->mTemplateIds += (array)$parserOutput->mTemplateIds; |
| 395 | | - $this->mImageTimestamps += (array)$parserOutput->mImageTimestamps; |
| 396 | 394 | |
| 397 | 395 | wfRunHooks( 'OutputPageParserOutput', array( &$this, $parserOutput ) ); |
| 398 | 396 | } |
| Index: branches/liquidthreads/includes/SpecialMovepage.php |
| — | — | @@ -284,12 +284,7 @@ |
| 285 | 285 | $newText = wfEscapeWikiText( $wgRequest->getVal('newtitle') ); |
| 286 | 286 | $talkmoved = $wgRequest->getVal('talkmoved'); |
| 287 | 287 | |
| 288 | | - $text = wfMsg( 'pagemovedtext', $oldText, $newText ); |
| 289 | | - |
| 290 | | - $allowHTML = $wgRawHtml; |
| 291 | | - $wgRawHtml = false; |
| 292 | | - $wgOut->addWikiText( $text ); |
| 293 | | - $wgRawHtml = $allowHTML; |
| | 288 | + $wgOut->addHtml( wfMsgExt( 'pagemovedtext', array( 'parse' ), $oldText, $newText ) ); |
| 294 | 289 | |
| 295 | 290 | if ( $talkmoved == 1 ) { |
| 296 | 291 | $wgOut->addWikiText( wfMsg( 'talkpagemoved' ) ); |
| Index: branches/liquidthreads/includes/SquidUpdate.php |
| — | — | @@ -81,9 +81,14 @@ |
| 82 | 82 | echo implode("<br />\n", $urlArr) . "<br />\n"; |
| 83 | 83 | return; |
| 84 | 84 | }*/ |
| | 85 | + |
| | 86 | + if( empty( $urlArr ) ) { |
| | 87 | + return; |
| | 88 | + } |
| 85 | 89 | |
| 86 | | - if ( $wgHTCPMulticastAddress && $wgHTCPPort ) |
| 87 | | - SquidUpdate::HTCPPurge( $urlArr ); |
| | 90 | + if ( $wgHTCPMulticastAddress && $wgHTCPPort ) { |
| | 91 | + return SquidUpdate::HTCPPurge( $urlArr ); |
| | 92 | + } |
| 88 | 93 | |
| 89 | 94 | $fname = 'SquidUpdate::purge'; |
| 90 | 95 | wfProfileIn( $fname ); |
| Index: branches/liquidthreads/languages/messages/MessagesEn.php |
| — | — | @@ -1076,6 +1076,7 @@ |
| 1077 | 1077 | 'currentrev' => 'Current revision', |
| 1078 | 1078 | 'revisionasof' => 'Revision as of $1', |
| 1079 | 1079 | 'revision-info' => 'Revision as of $1 by $2', |
| | 1080 | +'revision-info-current' => '-', |
| 1080 | 1081 | 'revision-nav' => '($1) $2 | $3 ($4) | $5 ($6)', # don't translate or duplicate this message to other languages |
| 1081 | 1082 | 'previousrevision' => '←Older revision', |
| 1082 | 1083 | 'nextrevision' => 'Newer revision→', |
| Index: branches/liquidthreads/languages/messages/MessagesPt_br.php |
| — | — | @@ -345,7 +345,7 @@ |
| 346 | 346 | Por favor realize ouro pedido de busca.', |
| 347 | 347 | 'matchtotals' => 'A pesquisa "$1" resultou $2 títulos de artigos |
| 348 | 348 | e $3 artigos com o texto procurado.', |
| 349 | | -'noexactmatch' => 'Nenhum artigo com um título exatamente igual a este foi encontrado, tentando na pesquisa completa por texto.', |
| | 349 | +'noexactmatch' => "'''Não existe uma página com o título \"\$1\".''' Você pode [[:\$1|criar tal página]].", |
| 350 | 350 | 'titlematches' => 'Resultados nos títulos dos artigos', |
| 351 | 351 | 'notitlematches' => 'Sem resultados nos títulos dos artigos', |
| 352 | 352 | 'textmatches' => 'Resultados nos textos dos artigos', |
| Index: branches/liquidthreads/RELEASE-NOTES |
| — | — | @@ -89,6 +89,9 @@ |
| 90 | 90 | * Kurdish interface latin/arabic writing system with transliteration |
| 91 | 91 | * Support wiki text in all query page headers |
| 92 | 92 | * Add 'Orphanedpages' as an alias to Special:Lonelypages |
| | 93 | +* (bug 9328) Use "revision-info-current" message in place of "revision-info" |
| | 94 | + when viewing the current revision of a page, if available |
| | 95 | +* (bug 8890) Enable wiki text for "license" message |
| 93 | 96 | |
| 94 | 97 | == Bugfixes since 1.10 == |
| 95 | 98 | |
| — | — | @@ -179,8 +182,10 @@ |
| 180 | 183 | * Escape the output of magic variables that return page name or part of it |
| 181 | 184 | * (bug 10309) Initialise parser state properly in extractSections(), fixes |
| 182 | 185 | some cases where section edits broke because tags were improperly stripped |
| | 186 | +* Avoid PHP notice errors when doing HTTP proxy purges for an empty list |
| | 187 | +* As intended, *skip* the HTTP proxy purges when doing HTCP purges |
| | 188 | +* (bug 9696) Fix handling of brace transformations in "pagemovedtext" |
| 183 | 189 | |
| 184 | | - |
| 185 | 190 | == API changes since 1.10 == |
| 186 | 191 | |
| 187 | 192 | (For ongoing development discussion, see http://www.mediawiki.org/wiki/API) |
| Property changes on: branches/liquidthreads |
| ___________________________________________________________________ |
| Modified: svnmerge-integrated |
| 188 | 193 | - /trunk/phase3:1-23102 |
| 189 | 194 | + /trunk/phase3:1-23119 |