Merge "EditPage: Try to avoid using $wgTitle"

diff --git a/includes/EditPage.php b/includes/EditPage.php
index 54b4cf5..0ea61c0 100644 (file)
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -469,6 +469,10 @@ class EditPage {
         */
        public function getContextTitle() {
                if ( is_null( $this->mContextTitle ) ) {
+                       wfDebugLog(
+                               'GlobalTitleFail',
+                               __METHOD__ . ' called by ' . wfGetAllCallers( 5 ) . ' with no title set.'
+                       );
                        global $wgTitle;
                        return $wgTitle;
                } else {

diff --git a/includes/actions/EditAction.php b/includes/actions/EditAction.php
index acfd72e..f0bc8bf 100644 (file)
--- a/includes/actions/EditAction.php
+++ b/includes/actions/EditAction.php
@@ -56,6 +56,7 @@ class EditAction extends FormlessAction {
 
                if ( Hooks::run( 'CustomEditor', [ $page, $user ] ) ) {
                        $editor = new EditPage( $page );
+                       $editor->setContextTitle( $this->getTitle() );
                        $editor->edit();
                }
        }