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 "Display a return to Special:Watchlist instead of main page in Special:EditWatc...
[lhc/web/wiklou.git]
/
includes
/
filerepo
/
file
/
LocalFile.php
diff --git
a/includes/filerepo/file/LocalFile.php
b/includes/filerepo/file/LocalFile.php
index
67768c4
..
e849c8e
100644
(file)
--- a/
includes/filerepo/file/LocalFile.php
+++ b/
includes/filerepo/file/LocalFile.php
@@
-633,7
+633,7
@@
class LocalFile extends File {
/**
* Fix thumbnail files from 1.4 or before, with extreme prejudice
/**
* Fix thumbnail files from 1.4 or before, with extreme prejudice
- * @
TODO
: do we still care about this? Perhaps a maintenance script
+ * @
todo
: do we still care about this? Perhaps a maintenance script
* can be made instead. Enabling this code results in a serious
* RTT regression for wikis without 404 handling.
*/
* can be made instead. Enabling this code results in a serious
* RTT regression for wikis without 404 handling.
*/
@@
-1043,7
+1043,7
@@
class LocalFile extends File {
if ( !$props ) {
wfProfileIn( __METHOD__ . '-getProps' );
$props = $this->repo->getFileProps( $this->getVirtualUrl() );
if ( !$props ) {
wfProfileIn( __METHOD__ . '-getProps' );
$props = $this->repo->getFileProps( $this->getVirtualUrl() );
- wfProfileOut( __METHOD__ .
-'
getProps' );
+ wfProfileOut( __METHOD__ .
'-
getProps' );
}
if ( $timestamp === false ) {
}
if ( $timestamp === false ) {
@@
-1456,7
+1456,7
@@
class LocalFile extends File {
*/
function getDescriptionText() {
global $wgParser;
*/
function getDescriptionText() {
global $wgParser;
- $revision = Revision::newFromTitle( $this->title, false, Revision::
AVOID_MASTER
);
+ $revision = Revision::newFromTitle( $this->title, false, Revision::
READ_NORMAL
);
if ( !$revision ) return false;
$text = $revision->getText();
if ( !$text ) return false;
if ( !$revision ) return false;
$text = $revision->getText();
if ( !$text ) return false;