| Index: trunk/phase3/includes/parser/ParserOutput.php |
| — | — | @@ -124,7 +124,7 @@ |
| 125 | 125 | $mDistantTemplates = array(), # 3-D map of WIKIID/NS/DBK to ID for the template references. ID=zero for broken. |
| 126 | 126 | $mDistantTemplateIds = array(), # 3-D map of WIKIID/NS/DBK to rev ID for the template references. ID=zero for broken. |
| 127 | 127 | $mImages = array(), # DB keys of the images used, in the array key only |
| 128 | | - $mImageTimeKeys = array(), # DB keys of the images used mapped to sha1 and MW timestamp |
| | 128 | + $mFileSearchOptions = array(), # DB keys of the images used mapped to sha1 and MW timestamp |
| 129 | 129 | $mExternalLinks = array(), # External link URLs, in the key only |
| 130 | 130 | $mInterwikiLinks = array(), # 2-D map of prefix/DBK (in keys only) for the inline interwiki links in the document. |
| 131 | 131 | $mNewSection = false, # Show a new section link? |
| — | — | @@ -197,7 +197,7 @@ |
| 198 | 198 | function &getDistantTemplateIds() { return $this->mDistantTemplateIds; } |
| 199 | 199 | function &getTemplateIds() { return $this->mTemplateIds; } |
| 200 | 200 | function &getImages() { return $this->mImages; } |
| 201 | | - function &getImageTimeKeys() { return $this->mImageTimeKeys; } |
| | 201 | + function &getFileSearchOptions() { return $this->mFileSearchOptions; } |
| 202 | 202 | function &getExternalLinks() { return $this->mExternalLinks; } |
| 203 | 203 | function getNoGallery() { return $this->mNoGallery; } |
| 204 | 204 | function getHeadItems() { return $this->mHeadItems; } |
| — | — | @@ -292,7 +292,7 @@ |
| 293 | 293 | function addImage( $name, $timestamp = null, $sha1 = null ) { |
| 294 | 294 | $this->mImages[$name] = 1; |
| 295 | 295 | if ( $timestamp !== null && $sha1 !== null ) { |
| 296 | | - $this->mImageTimeKeys[$name] = array( 'time' => $timestamp, 'sha1' => $sha1 ); |
| | 296 | + $this->mFileSearchOptions[$name] = array( 'time' => $timestamp, 'sha1' => $sha1 ); |
| 297 | 297 | } |
| 298 | 298 | } |
| 299 | 299 | |
| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -1301,7 +1301,7 @@ |
| 1302 | 1302 | * @return Array (dbKey => array('time' => MW timestamp or null, 'sha1' => sha1 or '')) |
| 1303 | 1303 | * @since 1.18 |
| 1304 | 1304 | */ |
| 1305 | | - public function getImageTimeKeys() { |
| | 1305 | + public function getFileSearchOptions() { |
| 1306 | 1306 | return $this->mImageTimeKeys; |
| 1307 | 1307 | } |
| 1308 | 1308 | |
| — | — | @@ -1415,7 +1415,7 @@ |
| 1416 | 1416 | } |
| 1417 | 1417 | } |
| 1418 | 1418 | // File versioning... |
| 1419 | | - foreach ( (array)$parserOutput->getImageTimeKeys() as $dbk => $data ) { |
| | 1419 | + foreach ( (array)$parserOutput->getFileSearchOptions() as $dbk => $data ) { |
| 1420 | 1420 | $this->mImageTimeKeys[$dbk] = $data; |
| 1421 | 1421 | } |
| 1422 | 1422 | |
| Index: trunk/extensions/FlaggedRevs/dataclasses/FlaggedRevs.class.php |
| — | — | @@ -595,7 +595,7 @@ |
| 596 | 596 | * @return bool |
| 597 | 597 | */ |
| 598 | 598 | public static function parserOutputIsVersioned( ParserOutput $pOut ) { |
| 599 | | - return ( $pOut->getTemplateIds() !== null && $pOut->getImageTimeKeys() !== null ); |
| | 599 | + return ( $pOut->getTemplateIds() !== null && $pOut->getFileSearchOptions() !== null ); |
| 600 | 600 | } |
| 601 | 601 | |
| 602 | 602 | # ################ Tracking/cache update update functions ################# |
| — | — | @@ -994,7 +994,7 @@ |
| 995 | 995 | 'img_timestamp' => $fileData['timestamp'], |
| 996 | 996 | 'img_sha1' => $fileData['sha1'], |
| 997 | 997 | 'templateVersions' => $poutput->getTemplateIds(), |
| 998 | | - 'fileVersions' => $poutput->getImageTimeKeys(), |
| | 998 | + 'fileVersions' => $poutput->getFileSearchOptions(), |
| 999 | 999 | 'flags' => implode( ',', $propFlags ), |
| 1000 | 1000 | ) ); |
| 1001 | 1001 | $flaggedRevision->insert(); |
| Index: trunk/extensions/FlaggedRevs/dataclasses/FRInclusionCache.php |
| — | — | @@ -43,7 +43,7 @@ |
| 44 | 44 | $rev->getText(), $title, $pOpts, true, true, $rev->getId() ); |
| 45 | 45 | } |
| 46 | 46 | # Get the template/file versions used... |
| 47 | | - $versions = array( $pOut->getTemplateIds(), $pOut->getImageTimeKeys() ); |
| | 47 | + $versions = array( $pOut->getTemplateIds(), $pOut->getFileSearchOptions() ); |
| 48 | 48 | # Save to cache (check cache expiry for dynamic elements)... |
| 49 | 49 | $data = FlaggedRevs::makeMemcObj( $versions ); |
| 50 | 50 | $wgMemc->set( $key, $data, $pOut->getCacheExpiry() ); |
| — | — | @@ -81,7 +81,7 @@ |
| 82 | 82 | global $wgMemc; |
| 83 | 83 | $key = self::getCacheKey( $title, $revId ); |
| 84 | 84 | # Get the template/file versions used... |
| 85 | | - $versions = array( $pOut->getTemplateIds(), $pOut->getImageTimeKeys() ); |
| | 85 | + $versions = array( $pOut->getTemplateIds(), $pOut->getFileSearchOptions() ); |
| 86 | 86 | # Save to cache (check cache expiry for dynamic elements)... |
| 87 | 87 | $data = FlaggedRevs::makeMemcObj( $versions ); |
| 88 | 88 | $wgMemc->set( $key, $data, $pOut->getCacheExpiry() ); |
| Index: trunk/extensions/FlaggedRevs/presentation/FlaggedPageView.php |
| — | — | @@ -1103,7 +1103,7 @@ |
| 1104 | 1104 | # Note: showStableVersion() already makes sure that $wgOut has the stable inclusion versions. |
| 1105 | 1105 | if ( $this->out->getRevisionId() == $rev->getId() && empty( $this->out->fr_unversionedIncludes ) ) { |
| 1106 | 1106 | $tmpVers = $this->out->getTemplateIds(); |
| 1107 | | - $fileVers = $this->out->getImageTimeKeys(); |
| | 1107 | + $fileVers = $this->out->getFileSearchOptions(); |
| 1108 | 1108 | } elseif ( $this->oldRevIncludes ) { // e.g. diffonly=1, stable diff |
| 1109 | 1109 | # We may have already fetched the inclusion IDs to get the template/file changes. |
| 1110 | 1110 | list( $tmpVers, $fileVers ) = $this->oldRevIncludes; // reuse |