From: Brion Vibber <brion@users.mediawiki.org>
Date: Fri, 2 Sep 2005 11:58:17 +0000 (+0000)
Subject: Revert last change, which breaks the only usage of the upload license selector
X-Git-Tag: 1.6.0~1735
X-Git-Url: http://git.cyclocoop.org//%22%22.str_replace%28%27%22%27%2C?a=commitdiff_plain;h=40d68b50c6822601d7ef643ac0f8d98c26ee7c69;p=lhc%2Fweb%2Fwiklou.git

Revert last change, which breaks the only usage of the upload license selector
with no explanation.
---

diff --git a/includes/Image.php b/includes/Image.php
index 2d0aa06eff..bbf1d428c9 100644
--- a/includes/Image.php
+++ b/includes/Image.php
@@ -1273,7 +1273,7 @@ class Image
 
 		if ( $wgUseCopyrightUpload ) {
 			if ( $license != '' ) {
-				$licensetxt = '== ' . wfMsg( 'license' ) . " ==$license\n";
+				$licensetxt = '== ' . wfMsg( 'license' ) . " ==\n" . '{{' . $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;
 			}