* Avoid PHP warning in Creative Commons metadata when a creative commons

  license is not actually set up

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 7b065b9..3a79f3d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -449,6 +449,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   preferred, utilize it for more parser tests of language variants code
 * (bug 6503) Fix bug that stopped certain irrelevant links from being hidden
   for printing
+* Avoid PHP warning in Creative Commons metadata when a creative commons
+  license is not actually set up
+
 
 == Languages updated ==
 

diff --git a/includes/Metadata.php b/includes/Metadata.php
index 4f3c7b1..b48ced0 100644 (file)
--- a/includes/Metadata.php
+++ b/includes/Metadata.php
@@ -317,7 +317,11 @@ function ccGetTerms($url) {
                return $wgLicenseTerms;
        } else {
                $known = getKnownLicenses();
-               return $known[$url];
+               if( isset( $known[$url] ) ) {
+                       return $known[$url];
+               } else {
+                       return array();
+               }
        }
 }