wikimedia/mediawiki-extensions-CiteThisPage
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CiteThisPage synced 2024-11-28 01:10:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Delete Cite::validateName(). Use Xml::escapeId() instead. All parser tests pass.

Browse source
This commit is contained in:
Aryeh Gregor 2008-07-30 21:23:43 +00:00
parent 4159799240
commit 9fcce4febe
1 changed files with 3 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
Cite_body.php
View file

@ -155,7 +155,7 @@ class Cite {
return $this->error( 'cite_error_ref_numeric_key' );
}
#Split these into groups.
# Split these into groups.
if( $group === null ) {
$group = $default_group;
}
@ -195,14 +195,14 @@ class Cite {
else if ( $cnt >= 1 ) {
if ( isset( $argv['name'] ) ) {
// Key given.
$key = $this->validateName( $argv['name'] );
$key = Sanitizer::escapeId( $argv['name'] );
unset( $argv['name']);
--$cnt;
}
if ( isset( $argv['group'] ) ){
if (! $wgAllowCiteGroups ) return array(false); //remove when groups are fully tested.
// Group given.
$group = $argv['group'];//don't apply validateName for group display
$group = $argv['group'];
unset( $argv['group']);
--$cnt;
}
@ -217,32 +217,6 @@ class Cite {
// No key
return array(null,$group);
}
/**
* Since the key name is used in an XHTML id attribute, it must
* conform to the validity rules. The restriction to begin with
* a letter is lifted since references have their own prefix.
*
* @fixme merge this code with the various section name transformations
* @fixme double-check for complete validity
* @return string if valid, false if invalid
*/
function validateName( $name ) {
if( preg_match( '/^[A-Za-z0-9:_.-]*$/i', $name ) ) {
return $name;
} else {
// WARNING: CRAPPY CUT AND PASTE MAKES BABY JESUS CRY
$text = urlencode( str_replace( ' ', '_', $name ) );
$replacearray = array(
'%3A' => ':',
'%' => '.'
);
return str_replace(
array_keys( $replacearray ),
array_values( $replacearray ),
$text );
}
}
/**
* Populate $this->mRefs based on input and arguments to <ref>