[Bug 60023] Wikimedia wikis are displaying the incorrect license information
https://bugzilla.wikimedia.org/show_bug.cgi?id=60023 --- Comment #7 from Andre Klapper aklap...@wikimedia.org --- Reedy: What's left here? Last call. -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 60023] Wikimedia wikis are displaying the incorrect license information
https://bugzilla.wikimedia.org/show_bug.cgi?id=60023 --- Comment #6 from Andre Klapper aklap...@wikimedia.org --- Reedy: What's left here? -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 60023] Wikimedia wikis are displaying the incorrect license information
https://bugzilla.wikimedia.org/show_bug.cgi?id=60023 --- Comment #5 from Andre Klapper aklap...@wikimedia.org --- Reedy: What's left here? -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 60023] Wikimedia wikis are displaying the incorrect license information
https://bugzilla.wikimedia.org/show_bug.cgi?id=60023 Andre Klapper aklap...@wikimedia.org changed: What|Removed |Added Priority|High|Normal CC||g...@wikimedia.org -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 60023] Wikimedia wikis are displaying the incorrect license information
https://bugzilla.wikimedia.org/show_bug.cgi?id=60023 --- Comment #4 from Greg Grossmeier g...@wikimedia.org --- What's left? -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 60023] Wikimedia wikis are displaying the incorrect license information
https://bugzilla.wikimedia.org/show_bug.cgi?id=60023 --- Comment #3 from Andre Klapper aklap...@wikimedia.org --- https://gerrit.wikimedia.org/r/#/c/107281/ and https://gerrit.wikimedia.org/r/#/c/107284/ are merged - I wonder who could work on the rest? -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 60023] Wikimedia wikis are displaying the incorrect license information
https://bugzilla.wikimedia.org/show_bug.cgi?id=60023 Andre Klapper aklap...@wikimedia.org changed: What|Removed |Added Priority|Unprioritized |High -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 60023] Wikimedia Wikis are displaying the incorrect license information
https://bugzilla.wikimedia.org/show_bug.cgi?id=60023 --- Comment #1 from Sam Reed (reedy) s...@reedyboy.net --- 'wikimedia-copyright' = 'Text is available under the a href=https://creativecommons.org/licenses/by-sa/3.0/;Creative Commons Attribution/Share-Alike License/a; additional terms may apply. See a href=https://wikimediafoundation.org/wiki/Terms_of_Use;Terms of Use/a for details.', -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 60023] Wikimedia wikis are displaying the incorrect license information
https://bugzilla.wikimedia.org/show_bug.cgi?id=60023 MZMcBride b...@mzmcbride.com changed: What|Removed |Added Summary|Wikimedia Wikis are |Wikimedia wikis are |displaying the incorrect|displaying the incorrect |license information |license information -- You are receiving this mail because: You are the assignee for the bug. You are on the CC list for the bug. ___ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
[Bug 60023] Wikimedia wikis are displaying the incorrect license information
https://bugzilla.wikimedia.org/show_bug.cgi?id=60023
--- Comment #2 from Sam Reed (reedy) s...@reedyboy.net ---
(In reply to comment #0)
Nothing seems to use $wmgUseDualLicense, and all wikis are displaying the
licensing of just CC BY SA...
The only thing in InitialiseSettings.php that changes is the following:
'wgRightsUrl' = array(
'default' = '//creativecommons.org/licenses/by-sa/3.0/',
'huwikinews' = '//creativecommons.org/licenses/by/3.0/',
'wikinews' = '//creativecommons.org/licenses/by/2.5/',
),
'wgRightsText' = array(
'default' = 'Creative Commons Attribution-Share Alike 3.0',
'huwikinews' = 'Creative Commons Attribution 3.0',
'wikinews' = 'Creative Commons Attribution 2.5',
),
'wgRightsIcon' = array(
'default' = '//creativecommons.org/images/public/somerights20.png',
),
Then in CommonSettings.php
// bug 44617
if ( in_array( $wgDBname, array( 'wikidatawiki', 'testwikidatawiki' ) ) ) {
$wgHooks['SkinCopyrightFooter'][] = function( $title, $type, $msg, $link,
$forContent ) {
if ( $title-getNamespace() === NS_MAIN ) {
$msg = 'Creative Commons Public Domain 1.0';
$link = '//creativecommons.org/publicdomain/zero/1.0/';
}
return true;
};
}
The only place any of these are modified further is in the WikimediaMessages
extension. The code is/was a little hard to follow in it's current format. I've
made it a bit simpler to read by putting things where they are used in
https://gerrit.wikimedia.org/r/107281 and a bit more simplification in
https://gerrit.wikimedia.org/r/107284
The code currently is now as such, it modifies the Skin Copyright Footer for
all wikis bar huwikinews and any of the other wikinews projects (see
$wgRightsUrl above)
if( strpos( $wgRightsUrl, 'creativecommons.org/licenses/by-sa/3.0' ) !==
false ) {
// Override with Wikimedia's site-specific copyright message defaults
// with the CC/GFDL semi-dual license fun!
/**
* @param $title Title
* @param $type string
* @param $msg string
* @param $link
* @param $forContent bool
* @return bool
*/
$wgHooks['SkinCopyrightFooter'][] = function( $title, $type, $msg,
$link, $forContent ) {
if( $type != 'history' ) {
global $wgDBname;
if ( in_array( $wgDBname, array( 'wikidatawiki',
'testwikidatawiki' ) ) ) {
$msg = 'wikidata-copyright';
} else {
$msg = 'wikimedia-copyright'; // the default;
}
$forContent = false;
}
return true;
};
$wgHooks['EditPageCopyrightWarning'][] = function( $title, $msg ) {
$msg = array( 'wikimedia-copyrightwarning' );
return true;
};
}
wikimedia-copyright doesn't mention GFDL, but 'wikimedia-copyrightwarning'
does. Neither of which respect $wmgUseDualLicense
The Wikidata messages are fine, though, should probably be collapsed down to
one set of config on the SkinCopyrightFooter hook.
For the variance, the current 'wikimedia-copyright' and
'wikimedia-copyrightwarning' need normalising, and then a dual variant adding
(or a singular depending on how current ones are changed)
Config then updated to be something like
if( strpos( $wgRightsUrl, 'creativecommons.org/licenses/by-sa/3.0' ) !==
false ) {
// Override with Wikimedia's site-specific copyright message defaults
// with the CC/GFDL semi-dual license fun!
/**
* @param $title Title
* @param $type string
* @param $msg string
* @param $link
* @param $forContent bool
* @return bool
*/
$wgHooks['SkinCopyrightFooter'][] = function( $title, $type, $msg,
$link, $forContent ) {
if( $type != 'history' ) {
global $wgDBname, $wmgUseDualLicense;
if ( in_array( $wgDBname, array( 'wikidatawiki',
'testwikidatawiki' ) ) ) {
$msg = 'wikidata-copyright';
} elseif ( $wmgUseDualLicense ) {
$msg = array( 'wikimedia-copyright-dual' );
} else {
$msg = array( 'wikimedia-copyright' );
}
$forContent = false;
}
return true;
};
$wgHooks['EditPageCopyrightWarning'][] = function( $title, $msg ) {
global $wmgUseDualLicense;
if ( $wmgUseDualLicense ) {
$msg = array( 'wikimedia-copyrightwarning-dual' );
} else {
$msg = array( 'wikimedia-copyrightwarning' );
}
return true;
};
}
--
You are receiving this mail because:
You are the assignee for the bug.
You are on the CC list for the bug.
___
Wikibugs-l mailing list
Wikibugs-l@lists.wikimedia.org
