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 "(bug 35993) API gettoken parameter is deprecated (release notes complement)"
[lhc/web/wiklou.git]
/
includes
/
ConfEditor.php
diff --git
a/includes/ConfEditor.php
b/includes/ConfEditor.php
index
d304e65
..
699e83a
100644
(file)
--- a/
includes/ConfEditor.php
+++ b/
includes/ConfEditor.php
@@
-1060,6
+1060,7
@@
class ConfEditorParseError extends MWException {
return "$line\n" .str_repeat( ' ', $this->colNum - 1 ) . "^\n";
}
}
+ return '';
}
}
@@
-1094,4
+1095,3
@@
class ConfEditorToken {
return $this->type == 'END';
}
}
-