dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "HTMLForm: Remove usage of HTMLForm::setSubmitProgressive"
[lhc/web/wiklou.git]
/
includes
/
Revision.php
diff --git
a/includes/Revision.php
b/includes/Revision.php
index
f8a3fcc
..
c948d9e
100644
(file)
--- a/
includes/Revision.php
+++ b/
includes/Revision.php
@@
-938,11
+938,6
@@
class Revision implements IDBAccessObject {
return $this->mRecord->getContent( 'main', $audience, $user );
}
catch ( RevisionAccessException $e ) {
return $this->mRecord->getContent( 'main', $audience, $user );
}
catch ( RevisionAccessException $e ) {
- wfDebugLog(
- 'T184670',
- __METHOD__ . ": Cannot get content: " . $e->getMessage() .
- "\n" . $e->getTraceAsString()
- );
return null;
}
}
return null;
}
}
@@
-1074,7
+1069,9
@@
class Revision implements IDBAccessObject {
return false;
}
return false;
}
- $cacheKey = isset( $row->old_id ) ? ( 'tt:' . $row->old_id ) : null;
+ $cacheKey = isset( $row->old_id )
+ ? SqlBlobStore::makeAddressFromTextId( $row->old_id )
+ : null;
return self::getBlobStore( $wiki )->expandBlob( $text, $flags, $cacheKey );
}
return self::getBlobStore( $wiki )->expandBlob( $text, $flags, $cacheKey );
}