From: Ævar Arnfjörð Bjarmason <avar@users.mediawiki.org>
Date: Fri, 2 Sep 2005 18:33:58 +0000 (+0000)
Subject: * Reverting back to 1.115, not inserting {{ and }} automatically means that the
X-Git-Tag: 1.6.0~1734
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%7B%7B%20url_for%28%27admin_users%27%29%20%7D%7D?a=commitdiff_plain;h=efe7338b08693d5f2816b8b115897dc79652ec0f;p=lhc%2Fweb%2Fwiklou.git

* 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
---

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;
 			}