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 "maintenance: Sanity check that --replicadb isn't using the master in sql.php"
[lhc/web/wiklou.git]
/
includes
/
content
/
TextContentHandler.php
diff --git
a/includes/content/TextContentHandler.php
b/includes/content/TextContentHandler.php
index
4a7944c
..
e3dc187
100644
(file)
--- a/
includes/content/TextContentHandler.php
+++ b/
includes/content/TextContentHandler.php
@@
-38,14
+38,14
@@
class TextContentHandler extends ContentHandler {
* Returns the content's text as-is.
*
* @param Content $content
* Returns the content's text as-is.
*
* @param Content $content
- * @param string $format The serialization format to check
+ * @param string
|null
$format The serialization format to check
*
* @return mixed
*/
public function serializeContent( Content $content, $format = null ) {
$this->checkFormat( $format );
*
* @return mixed
*/
public function serializeContent( Content $content, $format = null ) {
$this->checkFormat( $format );
- return $content->get
NativeData
();
+ return $content->get
Text
();
}
/**
}
/**
@@
-108,7
+108,7
@@
class TextContentHandler extends ContentHandler {
* @since 1.21
*
* @param string $text Serialized form of the content
* @since 1.21
*
* @param string $text Serialized form of the content
- * @param string $format The format used for serialization
+ * @param string
|null
$format The format used for serialization
*
* @return Content The TextContent object wrapping $text
*/
*
* @return Content The TextContent object wrapping $text
*/