Index: trunk/extensions/Cite/Cite_body.php |
— | — | @@ -693,13 +693,13 @@ |
694 | 694 | 'cite_references_link_one', |
695 | 695 | $this->referencesKey( $key ), |
696 | 696 | $this->refKey( $key ), |
697 | | - $val |
| 697 | + rtrim( $val, "\n" ) . "\n" |
698 | 698 | ); |
699 | 699 | } elseif ( isset( $val['follow'] ) ) { |
700 | 700 | return wfMsgForContentNoTrans( |
701 | 701 | 'cite_references_no_link', |
702 | 702 | $this->referencesKey( $val['follow'] ), |
703 | | - $val['text'] |
| 703 | + rtrim( $val['text'], "\n" ) . "\n" |
704 | 704 | ); |
705 | 705 | } elseif ( $val['text'] == '' ) { |
706 | 706 | return wfMsgForContentNoTrans( |
— | — | @@ -717,7 +717,7 @@ |
718 | 718 | # $this->refKey( $val['key'], $val['count'] ), |
719 | 719 | $this->refKey( $val['key'] ), |
720 | 720 | |
721 | | - ( $val['text'] != '' ? $val['text'] : $this->error( 'cite_error_references_no_text', $key ) ) |
| 721 | + ( $val['text'] != '' ? rtrim( $val['text'], "\n" ) . "\n" : $this->error( 'cite_error_references_no_text', $key ) ) |
722 | 722 | ); |
723 | 723 | // Standalone named reference, I want to format this like an |
724 | 724 | // anonymous reference because displaying "1. 1.1 Ref text" is |
— | — | @@ -729,7 +729,7 @@ |
730 | 730 | $this->referencesKey( $key . "-" . $val['key'] ), |
731 | 731 | # $this->refKey( $key, $val['count'] ), |
732 | 732 | $this->refKey( $key, $val['key'] . "-" . $val['count'] ), |
733 | | - ( $val['text'] != '' ? $val['text'] : $this->error( 'cite_error_references_no_text', $key ) ) |
| 733 | + ( $val['text'] != '' ? rtrim( $val['text'], "\n" ) . "\n" : $this->error( 'cite_error_references_no_text', $key ) ) |
734 | 734 | ); |
735 | 735 | // Named references with >1 occurrences |
736 | 736 | } else { |
— | — | @@ -749,7 +749,7 @@ |
750 | 750 | return wfMsgForContentNoTrans( 'cite_references_link_many', |
751 | 751 | $this->referencesKey( $key . "-" . $val['key'] ), |
752 | 752 | $list, |
753 | | - ( $val['text'] != '' ? $val['text'] : $this->error( 'cite_error_references_no_text', $key ) ) |
| 753 | + ( $val['text'] != '' ? rtrim( $val['text'], "\n" ) . "\n" : $this->error( 'cite_error_references_no_text', $key ) ) |
754 | 754 | ); |
755 | 755 | } |
756 | 756 | } |