* (bug 11114) Fix regression in read-only mode error display during editing

Regression caused by the new permissions error reporting system.
For read-only case, the read-only text didn't get passed back with the message from Title::getUserPermissionsErrors().
The text is either originally set in $wgReadOnly or gets loaded into it from $wgReadOnlyFile during wfReadOnly(), so pulling that it now gets passed back as expected.
Other functions using $wgOut->readOnlyPage() would have still got the original, still working, behavior.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 832aa75..b04ea6e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -426,6 +426,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   supressed, breaking paging - now strikes out "fixed" results
 * (bug 8393) <sup> and <sub> need to be preserved (without attributes) for
   entries in the table of contents
+* (bug 11114) Fix regression in read-only mode error display during editing
+
 
 == API changes since 1.10 ==
 

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 3f0d699..03ac587 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -545,9 +545,10 @@ class EditPage {
                        $this->summary   = '';
                        $this->edittime  = '';
                        $this->starttime = wfTimestampNow();
+                       $this->edit      = false;
                        $this->preview   = false;
                        $this->save      = false;
-                       $this->diff      = false;
+                       $this->diff      = false;
                        $this->minoredit = false;
                        $this->watchthis = false;
                        $this->recreate  = false;

diff --git a/includes/Title.php b/includes/Title.php
index f74192b..80f298c 100644 (file)
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1037,7 +1037,8 @@ class Title {
                global $wgLang;
 
                if ( wfReadOnly() && $action != 'read' ) {
-                       $errors[] = array( 'readonlytext' );
+                       global $wgReadOnly;
+                       $errors[] = array( 'readonlytext', $wgReadOnly );
                }
 
                global $wgEmailConfirmToEdit, $wgUser;