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 "Add .sass-cache to .gitignore"
[lhc/web/wiklou.git]
/
maintenance
/
importImages.php
diff --git
a/maintenance/importImages.php
b/maintenance/importImages.php
index
cbbcf0f
..
54fd4e2
100644
(file)
--- a/
maintenance/importImages.php
+++ b/
maintenance/importImages.php
@@
-230,14
+230,14
@@
if ( $count > 0 ) {
} else {
$props = FSFile::getPropsFromPath( $file );
$flags = 0;
} else {
$props = FSFile::getPropsFromPath( $file );
$flags = 0;
- $
o
ptions = array();
+ $
publishO
ptions = array();
$handler = MediaHandler::getHandler( $props['mime'] );
if ( $handler ) {
$handler = MediaHandler::getHandler( $props['mime'] );
if ( $handler ) {
- $
o
ptions['headers'] = $handler->getStreamHeaders( $props['metadata'] );
+ $
publishO
ptions['headers'] = $handler->getStreamHeaders( $props['metadata'] );
} else {
} else {
- $
o
ptions['headers'] = array();
+ $
publishO
ptions['headers'] = array();
}
}
- $archive = $image->publish( $file, $flags, $
o
ptions );
+ $archive = $image->publish( $file, $flags, $
publishO
ptions );
if ( !$archive->isGood() ) {
echo "failed. (" .
$archive->getWikiText() .
if ( !$archive->isGood() ) {
echo "failed. (" .
$archive->getWikiText() .
@@
-248,7
+248,7
@@
if ( $count > 0 ) {
}
$commentText = SpecialUpload::getInitialPageText( $commentText, $license );
}
$commentText = SpecialUpload::getInitialPageText( $commentText, $license );
- if ( !
$summary
) {
+ if ( !
isset( $options['summary'] )
) {
$summary = $commentText;
}
$summary = $commentText;
}