| Property changes on: trunk/phase3/maintenance/populateParentId.inc |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 1 | 1 | - /branches/REL1_15/phase3/maintenance/populateParentId.inc:51646 |
| Property changes on: trunk/phase3/maintenance/populateLogSearch.inc |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 2 | 2 | - /branches/REL1_15/phase3/maintenance/populateLogSearch.inc:51646 |
| Property changes on: trunk/phase3/maintenance/convertLinks.inc |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 3 | 3 | - /branches/REL1_15/phase3/maintenance/convertLinks.inc:51646 |
| Index: trunk/phase3/includes/User.php |
| — | — | @@ -216,8 +216,6 @@ |
| 217 | 217 | //@} |
| 218 | 218 | |
| 219 | 219 | static $idCacheByName = array(); |
| 220 | | - |
| 221 | | - public $mNewtalknumber; |
| 222 | 220 | |
| 223 | 221 | /** |
| 224 | 222 | * Lightweight constructor for an anonymous user. |
| — | — | @@ -1548,10 +1546,9 @@ |
| 1549 | 1547 | } else { |
| 1550 | 1548 | $db = wfGetDB( DB_SLAVE ); |
| 1551 | 1549 | } |
| 1552 | | - $query = $db->select( 'user_newtalk', $field, |
| | 1550 | + $ok = $db->selectField( 'user_newtalk', $field, |
| 1553 | 1551 | array( $field => $id ), __METHOD__ ); |
| 1554 | | - $this->mNewtalknumber = $ok = $db->numRows( $query ); |
| 1555 | | - return $ok !== 0; |
| | 1552 | + return $ok !== false; |
| 1556 | 1553 | } |
| 1557 | 1554 | |
| 1558 | 1555 | /** |
| — | — | @@ -1634,15 +1631,6 @@ |
| 1635 | 1632 | $this->invalidateCache(); |
| 1636 | 1633 | } |
| 1637 | 1634 | } |
| 1638 | | - |
| 1639 | | - /** |
| 1640 | | - * Return the number of new messages |
| 1641 | | - * @return \int The number of new messages |
| 1642 | | - */ |
| 1643 | | - public function getnewMessagesCount() { |
| 1644 | | - global $wgLang; |
| 1645 | | - return $wgLang->formatNum( $this->mNewtalknumber ); |
| 1646 | | - } |
| 1647 | 1635 | |
| 1648 | 1636 | /** |
| 1649 | 1637 | * Generate a current or new-future timestamp to be stored in the |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -302,13 +302,11 @@ |
| 303 | 303 | if( count( $newtalks ) == 1 && $newtalks[0]['wiki'] === wfWikiID() ) { |
| 304 | 304 | $usertitle = $this->mUser->getUserPage(); |
| 305 | 305 | $usertalktitle = $usertitle->getTalkPage(); |
| 306 | | - |
| 307 | | - $newmessagescount = $wgUser->getnewMessagesCount(); |
| 308 | 306 | |
| 309 | 307 | if( !$usertalktitle->equals( $this->mTitle ) ) { |
| 310 | 308 | $newmessageslink = $this->link( |
| 311 | 309 | $usertalktitle, |
| 312 | | - wfMsgExt( 'newmessageslink', array( 'parsemag', 'escape' ) ), |
| | 310 | + wfMsgHtml( 'newmessageslink' ), |
| 313 | 311 | array(), |
| 314 | 312 | array( 'redirect' => 'no' ), |
| 315 | 313 | array( 'known', 'noclasses' ) |
| — | — | @@ -316,7 +314,7 @@ |
| 317 | 315 | |
| 318 | 316 | $newmessagesdifflink = $this->link( |
| 319 | 317 | $usertalktitle, |
| 320 | | - wfMsgExt( 'newmessagesdifflink', array( 'parsemag', 'escape' ), $newmessagescount ), |
| | 318 | + wfMsgHtml( 'newmessagesdifflink' ), |
| 321 | 319 | array(), |
| 322 | 320 | array( 'diff' => 'cur' ), |
| 323 | 321 | array( 'known', 'noclasses' ) |
| — | — | @@ -512,7 +510,7 @@ |
| 513 | 511 | * @private |
| 514 | 512 | */ |
| 515 | 513 | function buildPersonalUrls() { |
| 516 | | - global $wgOut, $wgRequest, $wgUser, $wgLang; |
| | 514 | + global $wgOut, $wgRequest; |
| 517 | 515 | |
| 518 | 516 | $title = $wgOut->getTitle(); |
| 519 | 517 | $pageurl = $title->getLocalURL(); |
| — | — | @@ -533,26 +531,8 @@ |
| 534 | 532 | 'active' => ( $this->userpageUrlDetails['href'] == $pageurl ) |
| 535 | 533 | ); |
| 536 | 534 | $usertalkUrlDetails = $this->makeTalkUrlDetails( $this->userpage ); |
| 537 | | - if ( $wgUser->getNewtalk() ) { |
| 538 | | - # do not show text when we are viewing our |
| 539 | | - # own talk page |
| 540 | | - if( !$title->equals( $wgUser->getTalkPage() ) ) { |
| 541 | | - $newmessagescount = $wgUser->getnewMessagesCount(); |
| 542 | | - $newtalk = wfMsg( 'word-separator' ) . wfMsg( 'parentheses', $newmessagescount ); |
| 543 | | - |
| 544 | | - # disable caching |
| 545 | | - $wgOut->setSquidMaxage( 0 ); |
| 546 | | - $wgOut->enableClientCache( false ); |
| 547 | | - } |
| 548 | | - else { |
| 549 | | - $newtalk = ''; |
| 550 | | - } |
| 551 | | - } |
| 552 | | - else { |
| 553 | | - $newtalk = ''; |
| 554 | | - } |
| 555 | 535 | $personal_urls['mytalk'] = array( |
| 556 | | - 'text' => wfMsg( 'mytalk', $newtalk ), |
| | 536 | + 'text' => wfMsg( 'mytalk' ), |
| 557 | 537 | 'href' => &$usertalkUrlDetails['href'], |
| 558 | 538 | 'class' => $usertalkUrlDetails['exists'] ? false : 'new', |
| 559 | 539 | 'active' => ( $usertalkUrlDetails['href'] == $pageurl ) |
| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -1041,11 +1041,9 @@ |
| 1042 | 1042 | # do not show "You have new messages" text when we are viewing our |
| 1043 | 1043 | # own talk page |
| 1044 | 1044 | if( !$this->mTitle->equals( $wgUser->getTalkPage() ) ) { |
| 1045 | | - $nu = $wgUser->getnewMessagesCount(); |
| 1046 | | - |
| 1047 | 1045 | $tl = $this->link( |
| 1048 | 1046 | $wgUser->getTalkPage(), |
| 1049 | | - wfMsgExt( 'newmessageslink', array( 'parsemag', 'escape' ) ), |
| | 1047 | + wfMsgHtml( 'newmessageslink' ), |
| 1050 | 1048 | array(), |
| 1051 | 1049 | array( 'redirect' => 'no' ), |
| 1052 | 1050 | array( 'known', 'noclasses' ) |
| — | — | @@ -1053,7 +1051,7 @@ |
| 1054 | 1052 | |
| 1055 | 1053 | $dl = $this->link( |
| 1056 | 1054 | $wgUser->getTalkPage(), |
| 1057 | | - wfMsgExt( 'newmessagesdifflink', array( 'parsemag', 'escape' ), $nu ), |
| | 1055 | + wfMsgHtml( 'newmessagesdifflink' ), |
| 1058 | 1056 | array(), |
| 1059 | 1057 | array( 'diff' => 'cur' ), |
| 1060 | 1058 | array( 'known', 'noclasses' ) |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -751,7 +751,7 @@ |
| 752 | 752 | 'cancel' => 'Cancel', |
| 753 | 753 | 'moredotdotdot' => 'More...', |
| 754 | 754 | 'mypage' => 'My page', |
| 755 | | -'mytalk' => 'My talk$1', |
| | 755 | +'mytalk' => 'My talk', |
| 756 | 756 | 'anontalk' => 'Talk for this IP', |
| 757 | 757 | 'navigation' => 'Navigation', |
| 758 | 758 | 'and' => ' and', |
| — | — | @@ -896,7 +896,7 @@ |
| 897 | 897 | 'retrievedfrom' => 'Retrieved from "$1"', |
| 898 | 898 | 'youhavenewmessages' => 'You have $1 ($2).', |
| 899 | 899 | 'newmessageslink' => 'new messages', |
| 900 | | -'newmessagesdifflink' => '{{PLURAL:$1|one change|$1 changes}}', |
| | 900 | +'newmessagesdifflink' => 'last change', |
| 901 | 901 | 'youhavenewmessagesmulti' => 'You have new messages on $1', |
| 902 | 902 | 'newtalkseparator' => ', ', # do not translate or duplicate this message to other languages |
| 903 | 903 | 'editsection' => 'edit', |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -405,8 +405,6 @@ |
| 406 | 406 | * (bug 17864/19519) Added proper input normalization in Special:UserRights |
| 407 | 407 | * (bug 20086) Add Hook to add extra statistics at the end of Special:Statistics |
| 408 | 408 | * (bug 19289) importDump.php can now handle bzip2 and 7zip |
| 409 | | -* (bug 20103) Add after the link for "My Talk" a info with the number of the |
| 410 | | - new messages for the user |
| 411 | 409 | * (bug 20131) Fixed a PHP notice for users having the "rollback" right on |
| 412 | 410 | Special:RecentChangesLinked |
| 413 | 411 | |
| Property changes on: trunk/extensions/WikiAtHome/WahJobManager.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 414 | 412 | - |
| Property changes on: trunk/extensions/SlippyMap/SlippyMap.hook.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 415 | 413 | - |
| Property changes on: trunk/extensions/SlippyMap/js/SlippyMap.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 416 | 414 | - |
| Property changes on: trunk/extensions/Wikidata/patches/LocalSettings.txt |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 417 | 415 | - |
| Property changes on: trunk/extensions/Wikidata/Wikidata.i18n.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 418 | 416 | - |
| Property changes on: trunk/extensions/SecurePoll/includes/Base.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 419 | 417 | - |
| Property changes on: trunk/extensions/SecurePoll/cli/testDebian.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 420 | 418 | - |
| Property changes on: trunk/extensions/SecurePoll/resources/SecurePoll.css |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 421 | 419 | - |
| Property changes on: trunk/extensions/SecurePoll/resources/SecurePoll.js |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 422 | 420 | - |