Follows-up
f37cee996e which replaced the getHashMtime() and
getDefinitionMtime() methods with dummies that always return 1.
These getModifiedTime() implementations were only tracking the
definition summary or custom hash, which is already tracked
by getVersionHash().
Notes:
* SpecialCharacterDataModule: This one was odd as it was tracking
both the mtime *and* the file contents.
* UserCSSPrefsModule/UserOptionsModule: Remove redundant caching.
Already taken care of by getVersionHash() as of
f37cee996e.
Bug: T94074
Change-Id: I6e37c3c2f85ef4599a8643b0efabc18de2f51ec4
$files = array_values( array_unique( $files ) );
$filesMtime = max( array_map( array( __CLASS__, 'safeFilemtime' ), $files ) );
- return max(
- $filesMtime,
- $this->getDefinitionMtime( $context )
- );
+ return $filesMtime;
}
/**
);
}
- /**
- * @param ResourceLoaderContext $context
- * @return int UNIX timestamp
- */
- public function getModifiedTime( ResourceLoaderContext $context ) {
- return max( 1, $this->getHashMtime( $context ) );
- }
-
/**
* @param ResourceLoaderContext $context
* @return string Hash
return array( 'mediawiki.language.init' );
}
- /**
- * @param ResourceLoaderContext $context
- * @return int UNIX timestamp
- */
- public function getModifiedTime( ResourceLoaderContext $context ) {
- return max( 1, $this->getHashMtime( $context ) );
- }
-
/**
* @param ResourceLoaderContext $context
* @return string Hash
return false;
}
- /**
- * @param $context ResourceLoaderContext
- * @return int|mixed
- */
- public function getModifiedTime( ResourceLoaderContext $context ) {
- $parentMTime = parent::getModifiedTime( $context );
- return max( $parentMTime, $this->getHashMtime( $context ) );
- }
-
/**
* @param $context ResourceLoaderContext
* @return string: Hash
);
}
- /**
- * @param ResourceLoaderContext $context
- * @return int UNIX timestamp
- */
- public function getModifiedTime( ResourceLoaderContext $context ) {
- return static::safeFilemtime( $this->path );
- }
-
/**
* @param ResourceLoaderContext $context
* @return string Hash
*/
class ResourceLoaderUserCSSPrefsModule extends ResourceLoaderModule {
- /* Protected Members */
-
- protected $modifiedTime = array();
-
protected $origin = self::ORIGIN_CORE_INDIVIDUAL;
- /* Methods */
-
/**
* @param ResourceLoaderContext $context
* @return array|int|mixed
*/
public function getModifiedTime( ResourceLoaderContext $context ) {
- $hash = $context->getHash();
- if ( !isset( $this->modifiedTime[$hash] ) ) {
- $this->modifiedTime[$hash] = wfTimestamp( TS_UNIX, $context->getUserObj()->getTouched() );
- }
-
- return $this->modifiedTime[$hash];
+ return wfTimestamp( TS_UNIX, $context->getUserObj()->getTouched() );
}
/**
return md5( serialize( User::getDefaultOptions() ) );
}
- /**
- * @param ResourceLoaderContext $context
- * @return int
- */
- public function getModifiedTime( ResourceLoaderContext $context ) {
- return $this->getHashMtime( $context );
- }
-
/**
* @param ResourceLoaderContext $context
* @return string
*/
class ResourceLoaderUserOptionsModule extends ResourceLoaderModule {
- /* Protected Members */
-
- protected $modifiedTime = array();
-
protected $origin = self::ORIGIN_CORE_INDIVIDUAL;
protected $targets = array( 'desktop', 'mobile' );
- /* Methods */
-
/**
* @return array List of module names as strings
*/
* @return int
*/
public function getModifiedTime( ResourceLoaderContext $context ) {
- $hash = $context->getHash();
- if ( !isset( $this->modifiedTime[$hash] ) ) {
- $this->modifiedTime[$hash] = wfTimestamp( TS_UNIX, $context->getUserObj()->getTouched() );
- }
-
- return $this->modifiedTime[$hash];
+ return wfTimestamp( TS_UNIX, $context->getUserObj()->getTouched() );
}
/**
}
$modifiedTime = max(
$modifiedTime,
- $this->getMsgBlobMtime( $context->getLanguage() ),
- $this->getDefinitionMtime( $context )
+ $this->getMsgBlobMtime( $context->getLanguage() )
);
return $modifiedTime;
}