dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge the iwtransclusion branch back into trunk
[lhc/web/wiklou.git]
/
includes
/
parser
/
Preprocessor_Hash.php
diff --git
a/includes/parser/Preprocessor_Hash.php
b/includes/parser/Preprocessor_Hash.php
index
3078e43
..
50af6b6
100644
(file)
--- a/
includes/parser/Preprocessor_Hash.php
+++ b/
includes/parser/Preprocessor_Hash.php
@@
-148,9
+148,6
@@
class Preprocessor_Hash implements Preprocessor {
if ( strpos( $text, '<onlyinclude>' ) !== false && strpos( $text, '</onlyinclude>' ) !== false ) {
$enableOnlyinclude = true;
}
if ( strpos( $text, '<onlyinclude>' ) !== false && strpos( $text, '</onlyinclude>' ) !== false ) {
$enableOnlyinclude = true;
}
- } else if ( $this->parser->ot['wiki'] ) {
- $ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude', 'includeonly', '/includeonly' );
- $ignoredElements = array();
} else {
$ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude' );
$ignoredElements = array( 'includeonly' );
} else {
$ignoredTags = array( 'noinclude', '/noinclude', 'onlyinclude', '/onlyinclude' );
$ignoredElements = array( 'includeonly' );
@@
-979,6
+976,7
@@
class PPFrame_Hash implements PPFrame {
if ( $flags & PPFrame::NO_TEMPLATES ) {
$newIterator = $this->virtualBracketedImplode( '{{', '|', '}}', $bits['title'], $bits['parts'] );
} else {
if ( $flags & PPFrame::NO_TEMPLATES ) {
$newIterator = $this->virtualBracketedImplode( '{{', '|', '}}', $bits['title'], $bits['parts'] );
} else {
+ $bits['interwiki'] = $this->title->getInterwiki( );
$ret = $this->parser->braceSubstitution( $bits, $this );
if ( isset( $ret['object'] ) ) {
$newIterator = $ret['object'];
$ret = $this->parser->braceSubstitution( $bits, $this );
if ( isset( $ret['object'] ) ) {
$newIterator = $ret['object'];