Merge "Converted ChangeTags to using the WAN cache"

diff --combined includes/changetags/ChangeTags.php
index a0c3cf2,096fedc..64f89bf
--- 1/includes/changetags/ChangeTags.php
--- 2/includes/changetags/ChangeTags.php
+++ b/includes/changetags/ChangeTags.php
@@@ -382,9 -382,8 +382,9 @@@ class ChangeTags 
         * @return Status
         * @since 1.25
         */
 -      public static function addTagsAccompanyingChangeWithChecks( array $tags,
 -              $rc_id, $rev_id, $log_id, $params, User $user ) {
 +      public static function addTagsAccompanyingChangeWithChecks(
 +              array $tags, $rc_id, $rev_id, $log_id, $params, User $user
 +      ) {
  
                // are we allowed to do this?
                $result = self::canAddTagsAccompanyingChange( $tags, $user );
@@@ -394,7 -393,7 +394,7 @@@
                }
  
                // do it!
 -              self::addTags( $tagsToAdd, $rc_id, $rev_id, $log_id, $params );
 +              self::addTags( $tags, $rc_id, $rev_id, $log_id, $params );
  
                return Status::newGood( true );
        }
@@@ -518,6 -517,7 +518,6 @@@
                if ( $rev_id ) {
                        $rev = Revision::newFromId( $rev_id );
                        if ( $rev ) {
 -                              $title = $rev->getTitle();
                                $logEntry->setTarget( $rev->getTitle() );
                        }
                } elseif ( $log_id ) {
@@@ -706,7 -706,6 +706,7 @@@
         * @param User $user Who to attribute the action to
         * @param int $tagCount For deletion only, how many usages the tag had before
         * it was deleted.
 +       * @return int ID of the inserted log entry
         * @since 1.25
         */
        protected static function logTagManagementAction( $action, $tag, $reason,
@@@ -1064,10 -1063,10 +1064,10 @@@
         * @since 1.25
         */
        public static function listExtensionActivatedTags() {
-               // Caching...
-               global $wgMemc;
+               $cache = ObjectCache::getMainWANInstance();
+ 
                $key = wfMemcKey( 'active-tags' );
-               $tags = $wgMemc->get( $key );
+               $tags = $cache->get( $key );
                if ( $tags ) {
                        return $tags;
                }
@@@ -1077,7 -1076,8 +1077,8 @@@
                Hooks::run( 'ChangeTagsListActive', array( &$extensionActive ) );
  
                // Short-term caching.
-               $wgMemc->set( $key, $extensionActive, 300 );
+               $cache->set( $key, $extensionActive, 300 );
+ 
                return $extensionActive;
        }
  
@@@ -1105,10 -1105,10 +1106,10 @@@
         * @since 1.25
         */
        public static function listExplicitlyDefinedTags() {
-               // Caching...
-               global $wgMemc;
+               $cache = ObjectCache::getMainWANInstance();
+ 
                $key = wfMemcKey( 'valid-tags-db' );
-               $tags = $wgMemc->get( $key );
+               $tags = $cache->get( $key );
                if ( $tags ) {
                        return $tags;
                }
@@@ -1125,7 -1125,8 +1126,8 @@@
                $emptyTags = array_filter( array_unique( $emptyTags ) );
  
                // Short-term caching.
-               $wgMemc->set( $key, $emptyTags, 300 );
+               $cache->set( $key, $emptyTags, 300 );
+ 
                return $emptyTags;
        }
  
@@@ -1139,10 -1140,10 +1141,10 @@@
         * @since 1.25
         */
        public static function listExtensionDefinedTags() {
-               // Caching...
-               global $wgMemc;
+               $cache = ObjectCache::getMainWANInstance();
+ 
                $key = wfMemcKey( 'valid-tags-hook' );
-               $tags = $wgMemc->get( $key );
+               $tags = $cache->get( $key );
                if ( $tags ) {
                        return $tags;
                }
@@@ -1152,7 -1153,8 +1154,8 @@@
                $emptyTags = array_filter( array_unique( $emptyTags ) );
  
                // Short-term caching.
-               $wgMemc->set( $key, $emptyTags, 300 );
+               $cache->set( $key, $emptyTags, 300 );
+ 
                return $emptyTags;
        }
  
@@@ -1162,10 -1164,12 +1165,12 @@@
         * @since 1.25
         */
        public static function purgeTagCacheAll() {
-               global $wgMemc;
-               $wgMemc->delete( wfMemcKey( 'active-tags' ) );
-               $wgMemc->delete( wfMemcKey( 'valid-tags-db' ) );
-               $wgMemc->delete( wfMemcKey( 'valid-tags-hook' ) );
+               $cache = ObjectCache::getMainWANInstance();
+ 
+               $cache->delete( wfMemcKey( 'active-tags' ) );
+               $cache->delete( wfMemcKey( 'valid-tags-db' ) );
+               $cache->delete( wfMemcKey( 'valid-tags-hook' ) );
+ 
                self::purgeTagUsageCache();
        }
  
@@@ -1174,8 -1178,9 +1179,9 @@@
         * @since 1.25
         */
        public static function purgeTagUsageCache() {
-               global $wgMemc;
-               $wgMemc->delete( wfMemcKey( 'change-tag-statistics' ) );
+               $cache = ObjectCache::getMainWANInstance();
+ 
+               $cache->delete( wfMemcKey( 'change-tag-statistics' ) );
        }
  
        /**
@@@ -1188,10 -1193,10 +1194,10 @@@
         * @return array Array of string => int
         */
        public static function tagUsageStatistics() {
-               // Caching...
-               global $wgMemc;
+               $cache = ObjectCache::getMainWANInstance();
+ 
                $key = wfMemcKey( 'change-tag-statistics' );
-               $stats = $wgMemc->get( $key );
+               $stats = $cache->get( $key );
                if ( $stats ) {
                        return $stats;
                }
@@@ -1217,25 -1222,8 +1223,26 @@@
                }
  
                // Cache for a very short time
-               $wgMemc->set( $key, $out, 300 );
+               $cache->set( $key, $out, 300 );
+ 
                return $out;
        }
 +
 +      /**
 +       * Indicate whether change tag editing UI is relevant
 +       *
 +       * Returns true if the user has the necessary right and there are any
 +       * editable tags defined.
 +       *
 +       * This intentionally doesn't check "any addable || any deletable", because
 +       * it seems like it would be more confusing than useful if the checkboxes
 +       * suddenly showed up because some abuse filter stopped defining a tag and
 +       * then suddenly disappeared when someone deleted all uses of that tag.
 +       *
 +       * @param User $user
 +       * @return bool
 +       */
 +      public static function showTagEditingUI( User $user ) {
 +              return $user->isAllowed( 'changetags' ) && (bool)self::listExplicitlyDefinedTags();
 +      }
  }