Merge "Standardise preview warning box when using ?action=edit"

[lhc/web/wiklou.git] / includes / EditPage.php

diff --git a/includes/EditPage.php b/includes/EditPage.php
index fc9c577..d047f6e 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -25,7 +25,7 @@ use MediaWiki\EditPage\TextboxBuilder;
 use MediaWiki\EditPage\TextConflictHelper;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 use MediaWiki\EditPage\TextConflictHelper;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;

-use MediaWiki\Storage\RevisionRecord;
+use MediaWiki\Revision\RevisionRecord;

 use Wikimedia\ScopedCallback;
 
 /**
 use Wikimedia\ScopedCallback;
 
 /**


@@ -2742,7 +2742,7 @@ ERROR;
         * content.
         *
         * @param Content|null|bool|string $content
         * content.
         *
         * @param Content|null|bool|string $content

-        * @return string The editable text form of the content.
+        * @return string|false|null The editable text form of the content.

         *
         * @throws MWException If $content is not an instance of TextContent and
         *   $this->allowNonTextContent is not true.
         *
         * @throws MWException If $content is not an instance of TextContent and
         *   $this->allowNonTextContent is not true.