(bug 17691) Support CC0 license in installer

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index f9bc48a..c35e922 100644 (file)
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -386,6 +386,7 @@ More complex user rights configurations are available after installation, see th
        'config-license-none'             => 'No license footer',
        'config-license-cc-by-sa'         => 'Creative Commons Attribution Share Alike',
        'config-license-cc-by-nc-sa'      => 'Creative Commons Attribution Non-Commercial Share Alike',
+       'config-license-cc-0'             => 'Creative Commons Zero',
        'config-license-gfdl-old'         => 'GNU Free Documentation License 1.2',
        'config-license-gfdl-current'     => 'GNU Free Documentation License 1.3 or later',
        'config-license-pd'               => 'Public Domain',

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 3b4c2fe..838026b 100644 (file)
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -243,6 +243,10 @@ abstract class Installer {
                        'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
                        'icon' => '{$wgStylePath}/common/images/cc-by-nc-sa.png',
                ),
+               'cc-0' => array(
+                       'url' => 'https://creativecommons.org/publicdomain/zero/1.0/',
+                       'icon' => '{$wgStylePath}/common/images/cc-0.png',
+               ),
                'pd' => array(
                        'url' => 'http://creativecommons.org/licenses/publicdomain/',
                        'icon' => '{$wgStylePath}/common/images/public-domain.png',

diff --git a/skins/common/images/cc-0.png b/skins/common/images/cc-0.png
new file mode 100644 (file)
index 0000000..59f27f3
Binary files /dev/null and b/skins/common/images/cc-0.png differ