From e137ce07a8fc1345b42e95d055dcba2a09b9d467 Mon Sep 17 00:00:00 2001 From: Antoine Musso Date: Thu, 24 Jun 2004 13:26:08 +0000 Subject: [PATCH] patch by Laurent GUERBY to use/check copyright upload. Disabled by default. --- includes/DefaultSettings.php | 8 ++++++++ includes/SpecialUpload.php | 5 +++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 7a2dbb0064..6c244bf318 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -351,6 +351,14 @@ $wgRightsUrl = NULL; $wgRightsText = NULL; $wgRightsIcon = NULL; +# Set this to true if you want detailed copyright information forms on Upload. +$wgUseCopyrightUpload = false; + +# Set this to false if you want to disable checking that detailed +# copyright information values are not empty. +$wgCheckCopyrightUpload = true; + + # Set this to false to avoid forcing the first letter of links # to capitals. WARNING: may break links! This makes links # COMPLETELY case-sensitive. Links appearing with a capital at diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php index ef70a19a83..3b37ba5270 100644 --- a/includes/SpecialUpload.php +++ b/includes/SpecialUpload.php @@ -73,13 +73,14 @@ class UploadForm { global $wgUser, $wgOut, $wgLang; global $wgUploadDirectory; global $wgSavedFile, $wgUploadOldVersion; - global $wgUseCopyrightUpload; + global $wgUseCopyrightUpload, $wgCheckCopyrightUpload; global $wgCheckFileExtensions, $wgStrictFileExtensions; global $wgFileExtensions, $wgFileBlacklist, $wgUploadSizeWarning; if ( $wgUseCopyrightUpload ) { $this->mUploadAffirm = 1; - if ( trim ( $this->mUploadCopyStatus ) == "" || trim ( $this->mUploadSource ) == "" ) { + if ($wgCheckCopyrightUpload && + (trim ( $this->mUploadCopyStatus ) == "" || trim ( $this->mUploadSource ) == "" )) { $this->mUploadAffirm = 0; } } -- 2.20.1