r83400 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r83399‎ | r83400 | r83401 >
Date:20:14, 6 March 2011
Author:demon
Status:ok
Tags:
Comment:
(bug 17691) Support CC0 license in installer
Modified paths:
  • /trunk/phase3/includes/installer/Installer.i18n.php (modified) (history)
  • /trunk/phase3/includes/installer/Installer.php (modified) (history)
  • /trunk/phase3/skins/common/images/cc-0.png (added) (history)

Diff [purge]

Index: trunk/phase3/skins/common/images/cc-0.png
Cannot display: file marked as a binary type.
svn:mime-type = image/png
Property changes on: trunk/phase3/skins/common/images/cc-0.png
___________________________________________________________________
Added: svn:mime-type
11 + image/png
Index: trunk/phase3/includes/installer/Installer.php
@@ -243,6 +243,10 @@
244244 'url' => 'http://creativecommons.org/licenses/by-nc-sa/3.0/',
245245 'icon' => '{$wgStylePath}/common/images/cc-by-nc-sa.png',
246246 ),
 247+ 'cc-0' => array(
 248+ 'url' => 'https://creativecommons.org/publicdomain/zero/1.0/',
 249+ 'icon' => '{$wgStylePath}/common/images/cc-0.png',
 250+ ),
247251 'pd' => array(
248252 'url' => 'http://creativecommons.org/licenses/publicdomain/',
249253 'icon' => '{$wgStylePath}/common/images/public-domain.png',
Index: trunk/phase3/includes/installer/Installer.i18n.php
@@ -386,6 +386,7 @@
387387 'config-license-none' => 'No license footer',
388388 'config-license-cc-by-sa' => 'Creative Commons Attribution Share Alike',
389389 'config-license-cc-by-nc-sa' => 'Creative Commons Attribution Non-Commercial Share Alike',
 390+ 'config-license-cc-0' => 'Creative Commons Zero',
390391 'config-license-gfdl-old' => 'GNU Free Documentation License 1.2',
391392 'config-license-gfdl-current' => 'GNU Free Documentation License 1.3 or later',
392393 'config-license-pd' => 'Public Domain',

Follow-up revisions

RevisionCommit summaryAuthorDate
r84589MFT installer changes thru head (+db and autoloader changes from r80957)demon00:26, 23 March 2011

Status & tagging log