diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
| commit | c9aa36da061816dee256a979c2ff8d2ee41824d9 (patch) | |
| tree | 29f7002b80ee984b488bd047dbbd80b36bf892e9 /includes/resourceloader/ResourceLoaderUserOptionsModule.php | |
| parent | b4274e0e33eafb5e9ead9d949ebf031a9fb8363b (diff) | |
| parent | d1ba966140d7a60cd5ae4e8667ceb27c1a138592 (diff) | |
Merge branch 'archwiki'
# Conflicts:
# skins/ArchLinux.php
# skins/ArchLinux/archlogo.gif
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 ) { |