From efe7338b08693d5f2816b8b115897dc79652ec0f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Fri, 2 Sep 2005 18:33:58 +0000 Subject: [PATCH] * Reverting back to 1.115, not inserting {{ and }} automatically means that the license selector can be used to insert arbitary text, not just templates, this doesn't break it either since you just have to change the entries in MediaWiki:Licenses from e.g: * GFDL|GNU Free Documentation License to: * {{GFDL}}|GNU Free Documentation License to get the same functionality as before --- includes/Image.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/Image.php b/includes/Image.php index bbf1d428c9..2d0aa06eff 100644 --- a/includes/Image.php +++ b/includes/Image.php @@ -1273,7 +1273,7 @@ class Image if ( $wgUseCopyrightUpload ) { if ( $license != '' ) { - $licensetxt = '== ' . wfMsg( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n"; + $licensetxt = '== ' . wfMsg( 'license' ) . " ==$license\n"; } $textdesc = '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $desc . "\n" . '== ' . wfMsg ( 'filestatus' ) . " ==\n" . $copyStatus . "\n" . @@ -1283,7 +1283,7 @@ class Image if ( $license != '' ) { $filedesc = $desc == '' ? '' : '== ' . wfMsg ( 'filedesc' ) . " ==\n" . $desc . "\n"; $textdesc = $filedesc . - '== ' . wfMsg ( 'license' ) . " ==\n" . '{{' . $license . '}}' . "\n"; + '== ' . wfMsg ( 'license' ) . " ==\n$license\n"; } else { $textdesc = $desc; } -- 2.20.1