* 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 bbf1d42..2d0aa06 100644 (file)
--- 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;
                        }