* Using <ref name=str> instead of <ref str>

This commit is contained in:
Ævar Arnfjörð Bjarmason 2005-12-24 18:03:21 +00:00
parent 837fb7cd49
commit b271104237

View file

@ -14,7 +14,7 @@ $wgExtensionFunctions[] = 'wfCite';
$wgExtensionCredits['parserhook'][] = array( $wgExtensionCredits['parserhook'][] = array(
'name' => 'Cite', 'name' => 'Cite',
'author' => 'Ævar Arnfjörð Bjarmason', 'author' => 'Ævar Arnfjörð Bjarmason',
'description' => 'adds <nowiki><ref[ id]></nowiki> and <nowiki><references/></nowiki> tags, for citations', 'description' => 'adds <nowiki><ref[ name=id]></nowiki> and <nowiki><references/></nowiki> tags, for citations',
'url' => 'http://avar.lir.dk/mw/HEAD/wiki/Cite' 'url' => 'http://avar.lir.dk/mw/HEAD/wiki/Cite'
); );
@ -67,7 +67,7 @@ function wfCite() {
'cite_error_' . CITE_ERROR_REF_NUMERIC_KEY => 'Invalid call; expecting a non-integer key', 'cite_error_' . CITE_ERROR_REF_NUMERIC_KEY => 'Invalid call; expecting a non-integer key',
'cite_error_' . CITE_ERROR_REF_NO_KEY => 'Invalid call; no key specified', 'cite_error_' . CITE_ERROR_REF_NO_KEY => 'Invalid call; no key specified',
'cite_error_' . CITE_ERROR_REF_TOO_MANY_KEYS => 'Invalid call; too many keys specified', 'cite_error_' . CITE_ERROR_REF_TOO_MANY_KEYS => 'Invalid call; invalid keys, e.g. too many or wrong key specified',
'cite_error_' . CITE_ERROR_REF_NO_INPUT => 'Invalid call; no input specified', 'cite_error_' . CITE_ERROR_REF_NO_INPUT => 'Invalid call; no input specified',
'cite_error_' . CITE_ERROR_REFERENCES_INVALID_INPUT => 'Invalid input; expecting none', 'cite_error_' . CITE_ERROR_REFERENCES_INVALID_INPUT => 'Invalid input; expecting none',
'cite_error_' . CITE_ERROR_REFERENCES_INVALID_PARAMETERS => 'Invalid parameters; expecting none', 'cite_error_' . CITE_ERROR_REFERENCES_INVALID_PARAMETERS => 'Invalid parameters; expecting none',
@ -217,12 +217,19 @@ function wfCite() {
* input and null on no input * input and null on no input
*/ */
function refArg( $argv ) { function refArg( $argv ) {
if ( count( $argv ) > 1 )
$cnt = count( $argv );
if ( $cnt > 1 )
// There should only be one key // There should only be one key
return false; return false;
else if ( count( $argv ) == 1 ) else if ( $cnt == 1 )
if ( isset( $argv['name'] ) )
// Key given. // Key given.
return array_shift( $argv ); return array_shift( $argv );
else
// Invalid key
return false;
else else
// No key // No key
return null; return null;