diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2014-12-27 15:41:37 +0100 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2014-12-31 11:43:28 +0100 |
commit | c1f9b1f7b1b77776192048005dcc66dcf3df2bfb (patch) | |
tree | 2b38796e738dd74cb42ecd9bfd151803108386bc /includes/resourceloader/ResourceLoaderUserOptionsModule.php | |
parent | b88ab0086858470dd1f644e64cb4e4f62bb2be9b (diff) |
Update to MediaWiki 1.24.1
Diffstat (limited to 'includes/resourceloader/ResourceLoaderUserOptionsModule.php')
-rw-r--r-- | includes/resourceloader/ResourceLoaderUserOptionsModule.php | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/includes/resourceloader/ResourceLoaderUserOptionsModule.php b/includes/resourceloader/ResourceLoaderUserOptionsModule.php index 0b7e1964..bd97a8e5 100644 --- a/includes/resourceloader/ResourceLoaderUserOptionsModule.php +++ b/includes/resourceloader/ResourceLoaderUserOptionsModule.php @@ -33,24 +33,26 @@ class ResourceLoaderUserOptionsModule extends ResourceLoaderModule { protected $origin = self::ORIGIN_CORE_INDIVIDUAL; + protected $targets = array( 'desktop', 'mobile' ); + /* Methods */ /** - * @param $context ResourceLoaderContext - * @return array|int|Mixed + * @param ResourceLoaderContext $context + * @return array|int|mixed */ public function getModifiedTime( ResourceLoaderContext $context ) { $hash = $context->getHash(); - if ( isset( $this->modifiedTime[$hash] ) ) { - return $this->modifiedTime[$hash]; + if ( !isset( $this->modifiedTime[$hash] ) ) { + global $wgUser; + $this->modifiedTime[$hash] = wfTimestamp( TS_UNIX, $wgUser->getTouched() ); } - global $wgUser; - return $this->modifiedTime[$hash] = wfTimestamp( TS_UNIX, $wgUser->getTouched() ); + return $this->modifiedTime[$hash]; } /** - * @param $context ResourceLoaderContext + * @param ResourceLoaderContext $context * @return string */ public function getScript( ResourceLoaderContext $context ) { |