dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d4c4ed8
)
Don't assume the file repository will always return an object when checking for dupes
author
Brion Vibber
<brion@users.mediawiki.org>
Wed, 21 May 2008 22:36:53 +0000
(22:36 +0000)
committer
Brion Vibber
<brion@users.mediawiki.org>
Wed, 21 May 2008 22:36:53 +0000
(22:36 +0000)
includes/ImagePage.php
patch
|
blob
|
history
diff --git
a/includes/ImagePage.php
b/includes/ImagePage.php
index
a9070da
..
3b0c6b7
100644
(file)
--- a/
includes/ImagePage.php
+++ b/
includes/ImagePage.php
@@
-552,10
+552,11
@@
EOT
function checkSharedConflictCallback( $repo ) {
$this->loadFile();
$dupfile = $repo->newFile( $this->img->getTitle() );
- if( $dupfile->exists() ) {
+ if( $dupfile
&& $dupfile
->exists() ) {
$this->dupFile = $dupfile;
+ return $dupfile->exists();
}
- return
$dupfile->exists()
;
+ return
false
;
}
function getUploadUrl() {