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 "Log when resyncFiles() fails in FileBackendMultiWrite"
[lhc/web/wiklou.git]
/
includes
/
parser
/
Parser.php
diff --git
a/includes/parser/Parser.php
b/includes/parser/Parser.php
index
5ee0c5a
..
a1d62e5
100644
(file)
--- a/
includes/parser/Parser.php
+++ b/
includes/parser/Parser.php
@@
-739,8
+739,7
@@
class Parser {
if ( $t->hasFragment() ) {
# Strip the fragment to avoid various odd effects
if ( $t->hasFragment() ) {
# Strip the fragment to avoid various odd effects
- $this->mTitle = clone $t;
- $this->mTitle->setFragment( '' );
+ $this->mTitle = $t->createFragmentTarget( '' );
} else {
$this->mTitle = $t;
}
} else {
$this->mTitle = $t;
}
@@
-1115,7
+1114,7
@@
class Parser {
// Implies both are valid for table headings.
if ( $first_character === '!' ) {
// Implies both are valid for table headings.
if ( $first_character === '!' ) {
- $line =
str_replace
( '!!', '||', $line );
+ $line =
StringUtils::replaceMarkup
( '!!', '||', $line );
}
# Split up multiple cells on the same line.
}
# Split up multiple cells on the same line.
@@
-1213,9
+1212,9
@@
class Parser {
*
* @private
*
*
* @private
*
- * @param string $text
- * @param bool $isMain
- * @param PPFrame|bool $frame
+ * @param string $text
The text to parse
+ * @param bool $isMain
Whether this is being called from the main parse() function
+ * @param PPFrame|bool $frame
A pre-processor frame
*
* @return string
*/
*
* @return string
*/