| Index: trunk/phase3/includes/ParserOutput.php |
| — | — | @@ -16,7 +16,6 @@ |
| 17 | 17 | $mTemplates, # 2-D map of NS/DBK to ID for the template references. ID=zero for broken. |
| 18 | 18 | $mTemplateIds, # 2-D map of NS/DBK to rev ID for the template references. ID=zero for broken. |
| 19 | 19 | $mImages, # DB keys of the images used, in the array key only |
| 20 | | - $mImageTimestamps, # Map of DBK to rev ID for the template references. ID=zero for broken. |
| 21 | 20 | $mExternalLinks, # External link URLs, in the key only |
| 22 | 21 | $mHTMLtitle, # Display HTML title |
| 23 | 22 | $mSubtitle, # Additional subtitle |
| — | — | @@ -44,7 +43,6 @@ |
| 45 | 44 | $this->mNoGallery = false; |
| 46 | 45 | $this->mHeadItems = array(); |
| 47 | 46 | $this->mTemplateIds = array(); |
| 48 | | - $this->mImageTimestamps = array(); |
| 49 | 47 | } |
| 50 | 48 | |
| 51 | 49 | function getText() { return $this->mText; } |
| — | — | @@ -92,19 +90,8 @@ |
| 93 | 91 | $this->mLinks[$ns][$dbk] = $id; |
| 94 | 92 | } |
| 95 | 93 | |
| 96 | | - function addImage( $name, $timestamp=NULL ) { |
| 97 | | - if( isset($this->mImages[$name]) ) |
| 98 | | - return; // No repeated pointless DB calls! |
| | 94 | + function addImage( $name ) { |
| 99 | 95 | $this->mImages[$name] = 1; |
| 100 | | - if( is_null($timestamp) ) { |
| 101 | | - wfProfileIn( __METHOD__ ); |
| 102 | | - $dbr = wfGetDB(DB_SLAVE); |
| 103 | | - $timestamp = $dbr->selectField('image', 'img_timestamp', |
| 104 | | - array('img_name' => $name), |
| 105 | | - __METHOD__ ); |
| 106 | | - } |
| 107 | | - $timestamp = $timestamp ? $timestamp : null; |
| 108 | | - $this->mImageTimestamps[$name] = $timestamp; // For versioning |
| 109 | 96 | } |
| 110 | 97 | |
| 111 | 98 | function addTemplate( $title, $page_id, $rev_id ) { |