Merge "Make change tagging of edits in RecentChange::notifyNew/Edit"

diff --combined includes/page/WikiPage.php
index 74d4904,4e491e8..cfd8d6b
--- 1/includes/page/WikiPage.php
--- 2/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@@ -1636,6 -1636,9 +1636,9 @@@ class WikiPage implements Page, IDBAcce
         * @param User $user The user doing the edit
         * @param string $serialFormat Format for storing the content in the
         *   database.
+        * @param array|null $tags Change tags to apply to this edit
+        * Callers are responsible for permission checks
+        * (with ChangeTags::canAddTagsAccompanyingChange)
         *
         * @throws MWException
         * @return Status Possible errors:
@@@ -1657,7 -1660,7 +1660,7 @@@
         */
        public function doEditContent(
                Content $content, $summary, $flags = 0, $baseRevId = false,
-               User $user = null, $serialFormat = null
+               User $user = null, $serialFormat = null, $tags = null
        ) {
                global $wgUser, $wgUseAutomaticEditSummaries;
  
@@@ -1719,7 -1722,8 +1722,8 @@@
                        'oldContent' => $old_content,
                        'oldId' => $this->getLatest(),
                        'oldIsRedirect' => $this->isRedirect(),
-                       'oldCountable' => $this->isCountable()
+                       'oldCountable' => $this->isCountable(),
+                       'tags' => ( $tags !== null ) ? (array)$tags : array()
                );
  
                // Actually create the revision and create/update the page
@@@ -1850,7 -1854,8 +1854,8 @@@
                                        $oldContent ? $oldContent->getSize() : 0,
                                        $newsize,
                                        $revisionId,
-                                       $patrolled
+                                       $patrolled,
+                                       $meta['tags']
                                );
                        }
  
@@@ -1989,7 -1994,8 +1994,8 @@@
                                '',
                                $newsize,
                                $revisionId,
-                               $patrolled
+                               $patrolled,
+                               $meta['tags']
                        );
                }
  
@@@ -2211,7 -2217,7 +2217,7 @@@
         *   - 'no-change': don't update the article count, ever
         */
        public function doEditUpdates( Revision $revision, User $user, array $options = array() ) {
 -              global $wgRCWatchCategoryMembership;
 +              global $wgRCWatchCategoryMembership, $wgContLang;
  
                $options += array(
                        'changed' => true,
@@@ -2340,10 -2346,6 +2346,10 @@@
                        }
  
                        MessageCache::singleton()->replace( $shortTitle, $msgtext );
 +
 +                      if ( $wgContLang->hasVariants() ) {
 +                              $wgContLang->updateConversionTable( $this->mTitle );
 +                      }
                }
  
                if ( $options['created'] ) {
@@@ -3063,13 -3065,17 +3069,17 @@@
         *    success        : 'summary' (str), 'current' (rev), 'target' (rev)
         *
         * @param User $user The user performing the rollback
+        * @param array|null $tags Change tags to apply to the rollback
+        * Callers are responsible for permission checks
+        * (with ChangeTags::canAddTagsAccompanyingChange)
+        *
         * @return array Array of errors, each error formatted as
         *   array(messagekey, param1, param2, ...).
         * On success, the array is empty.  This array can also be passed to
         * OutputPage::showPermissionsErrorPage().
         */
        public function doRollback(
-               $fromP, $summary, $token, $bot, &$resultDetails, User $user
+               $fromP, $summary, $token, $bot, &$resultDetails, User $user, $tags = null
        ) {
                $resultDetails = null;
  
@@@ -3091,7 -3097,7 +3101,7 @@@
                        return $errors;
                }
  
-               return $this->commitRollback( $fromP, $summary, $bot, $resultDetails, $user );
+               return $this->commitRollback( $fromP, $summary, $bot, $resultDetails, $user, $tags );
        }
  
        /**
@@@ -3108,9 -3114,15 +3118,15 @@@
         *
         * @param array $resultDetails Contains result-specific array of additional values
         * @param User $guser The user performing the rollback
+        * @param array|null $tags Change tags to apply to the rollback
+        * Callers are responsible for permission checks
+        * (with ChangeTags::canAddTagsAccompanyingChange)
+        *
         * @return array
         */
-       public function commitRollback( $fromP, $summary, $bot, &$resultDetails, User $guser ) {
+       public function commitRollback( $fromP, $summary, $bot,
+               &$resultDetails, User $guser, $tags = null
+       ) {
                global $wgUseRCPatrol, $wgContLang;
  
                $dbw = wfGetDB( DB_MASTER );
@@@ -3205,7 -3217,9 +3221,9 @@@
                        $summary,
                        $flags,
                        $target->getId(),
-                       $guser
+                       $guser,
+                       null,
+                       $tags
                );
  
                // Set patrolling and bot flag on the edits, which gets rollbacked.
@@@ -3291,8 -3305,6 +3309,8 @@@
         * @param Title $title
         */
        public static function onArticleDelete( Title $title ) {
 +              global $wgContLang;
 +
                // Update existence markers on article/talk tabs...
                $other = $title->getOtherPage();
  
@@@ -3308,10 -3320,6 +3326,10 @@@
                // Messages
                if ( $title->getNamespace() == NS_MEDIAWIKI ) {
                        MessageCache::singleton()->replace( $title->getDBkey(), false );
 +
 +                      if ( $wgContLang->hasVariants() ) {
 +                              $wgContLang->updateConversionTable( $title );
 +                      }
                }
  
                // Images