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 "Add attributes parameter to ShowSearchHitTitle"
[lhc/web/wiklou.git]
/
includes
/
content
/
TextContent.php
diff --git
a/includes/content/TextContent.php
b/includes/content/TextContent.php
index
7bb4def
..
e5a9f90
100644
(file)
--- a/
includes/content/TextContent.php
+++ b/
includes/content/TextContent.php
@@
-34,6
+34,11
@@
*/
class TextContent extends AbstractContent {
*/
class TextContent extends AbstractContent {
+ /**
+ * @var string
+ */
+ protected $mText;
+
/**
* @param string $text
* @param string $model_id
/**
* @param string $text
* @param string $model_id
@@
-157,7
+162,7
@@
class TextContent extends AbstractContent {
* changes.
*
* @since 1.28
* changes.
*
* @since 1.28
- * @param $text
+ * @param
string
$text
* @return string
*/
public static function normalizeLineEndings( $text ) {
* @return string
*/
public static function normalizeLineEndings( $text ) {
@@
-233,7
+238,7
@@
class TextContent extends AbstractContent {
* @param int $revId Revision ID (for {{REVISIONID}})
* @param ParserOptions $options Parser options
* @param bool $generateHtml Whether or not to generate HTML
* @param int $revId Revision ID (for {{REVISIONID}})
* @param ParserOptions $options Parser options
* @param bool $generateHtml Whether or not to generate HTML
- * @param ParserOutput $output The output object to fill (reference).
+ * @param ParserOutput
&
$output The output object to fill (reference).
*/
protected function fillParserOutput( Title $title, $revId,
ParserOptions $options, $generateHtml, ParserOutput &$output
*/
protected function fillParserOutput( Title $title, $revId,
ParserOptions $options, $generateHtml, ParserOutput &$output