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 "Make deferred updates fully own their transaction rounds"
[lhc/web/wiklou.git]
/
includes
/
parser
/
StripState.php
diff --git
a/includes/parser/StripState.php
b/includes/parser/StripState.php
index
b11dc8c
..
4ed176c
100644
(file)
--- a/
includes/parser/StripState.php
+++ b/
includes/parser/StripState.php
@@
-46,12
+46,12
@@
class StripState {
wfDeprecated( __METHOD__ . ' with called with $prefix argument' .
' (call with no arguments instead)', '1.26' );
}
wfDeprecated( __METHOD__ . ' with called with $prefix argument' .
' (call with no arguments instead)', '1.26' );
}
- $this->data =
array(
- 'nowiki' =>
array()
,
- 'general' =>
array()
-
)
;
- $this->regex = '/' . Parser::MARKER_PREFIX . "([^\x7f]+)" . Parser::MARKER_SUFFIX . '/';
- $this->circularRefGuard =
array()
;
+ $this->data =
[
+ 'nowiki' =>
[]
,
+ 'general' =>
[]
+
]
;
+ $this->regex = '/' . Parser::MARKER_PREFIX . "([^\x7f
<>&'\"
]+)" . Parser::MARKER_SUFFIX . '/';
+ $this->circularRefGuard =
[]
;
}
/**
}
/**
@@
-124,7
+124,7
@@
class StripState {
$oldType = $this->tempType;
$this->tempType = $type;
$oldType = $this->tempType;
$this->tempType = $type;
- $text = preg_replace_callback( $this->regex,
array( $this, 'unstripCallback' )
, $text );
+ $text = preg_replace_callback( $this->regex,
[ $this, 'unstripCallback' ]
, $text );
$this->tempType = $oldType;
return $text;
}
$this->tempType = $oldType;
return $text;
}
@@
-216,7
+216,7
@@
class StripState {
}
$this->tempMergePrefix = $mergePrefix;
}
$this->tempMergePrefix = $mergePrefix;
- $texts = preg_replace_callback( $otherState->regex,
array( $this, 'mergeCallback' )
, $texts );
+ $texts = preg_replace_callback( $otherState->regex,
[ $this, 'mergeCallback' ]
, $texts );
$this->tempMergePrefix = null;
return $texts;
}
$this->tempMergePrefix = null;
return $texts;
}