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
(bug 43467) Add invert selection for ns in Special:Newpages
[lhc/web/wiklou.git]
/
includes
/
FileDeleteForm.php
diff --git
a/includes/FileDeleteForm.php
b/includes/FileDeleteForm.php
index
e2fcd9c
..
48073f7
100644
(file)
--- a/
includes/FileDeleteForm.php
+++ b/
includes/FileDeleteForm.php
@@
-80,13
+80,13
@@
class FileDeleteForm {
$this->oldimage = $wgRequest->getText( 'oldimage', false );
$token = $wgRequest->getText( 'wpEditToken' );
# Flag to hide all contents of the archived revisions
$this->oldimage = $wgRequest->getText( 'oldimage', false );
$token = $wgRequest->getText( 'wpEditToken' );
# Flag to hide all contents of the archived revisions
- $suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed(
'suppressrevision'
);
+ $suppress = $wgRequest->getVal( 'wpSuppress' ) && $wgUser->isAllowed(
'suppressrevision'
);
if( $this->oldimage ) {
$this->oldfile = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $this->title, $this->oldimage );
}
if( $this->oldimage ) {
$this->oldfile = RepoGroup::singleton()->getLocalRepo()->newFromArchiveName( $this->title, $this->oldimage );
}
- if( !self::haveDeletableFile(
$this->file, $this->oldfile, $this->oldimage
) ) {
+ if( !self::haveDeletableFile(
$this->file, $this->oldfile, $this->oldimage
) ) {
$wgOut->addHTML( $this->prepareMessage( 'filedelete-nofile' ) );
$wgOut->addReturnTo( $this->title );
return;
$wgOut->addHTML( $this->prepareMessage( 'filedelete-nofile' ) );
$wgOut->addReturnTo( $this->title );
return;
@@
-344,7
+344,7
@@
class FileDeleteForm {
*
* @return bool
*/
*
* @return bool
*/
- public static function isValidOldSpec(
$oldimage
) {
+ public static function isValidOldSpec(
$oldimage
) {
return strlen( $oldimage ) >= 16
&& strpos( $oldimage, '/' ) === false
&& strpos( $oldimage, '\\' ) === false;
return strlen( $oldimage ) >= 16
&& strpos( $oldimage, '/' ) === false
&& strpos( $oldimage, '\\' ) === false;
@@
-360,7
+360,7
@@
class FileDeleteForm {
* @param $oldimage File
* @return bool
*/
* @param $oldimage File
* @return bool
*/
- public static function haveDeletableFile(
&$file, &$oldfile, $oldimage
) {
+ public static function haveDeletableFile(
&$file, &$oldfile, $oldimage
) {
return $oldimage
? $oldfile && $oldfile->exists() && $oldfile->isLocal()
: $file && $file->exists() && $file->isLocal();
return $oldimage
? $oldfile && $oldfile->exists() && $oldfile->isLocal()
: $file && $file->exists() && $file->isLocal();