Bug 15514. Allow plaintext copyright notices if $wgCopyrightUrl is unset.

diff --git a/CREDITS b/CREDITS
index 82d4b6f..6ec18ed 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -47,6 +47,7 @@ following names for their contribution to the product.
 * Michael De La Rue
 * Mike Horvath
 * Mormegil
+* Juliano F. Ravasi
 * RememberTheDot
 * ST47
 

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 875af18..3e75b2f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -119,6 +119,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 5619) Break messages used in Special:Statistics down further
 * (bug 11029) Add link to Special:Listusers?group=sysop etc at
   Special:Statistics
+* (bug 15514) Setting $wgRightsText without $wgRightsUrl now produces a 
+  plaintext 
 
 === Bug fixes in 1.14 ===
 

diff --git a/includes/Skin.php b/includes/Skin.php
index 5dd109f..0c45f49 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -1306,6 +1306,8 @@ END;
                        $link = $this->makeKnownLink( $wgRightsPage, $wgRightsText );
                } elseif( $wgRightsUrl ) {
                        $link = $this->makeExternalLink( $wgRightsUrl, $wgRightsText );
+               } elseif( $wgRightsText ) {
+                       $link = $wgRightsText;
                } else {
                        # Give up now
                        return $out;