From ce0e2cf341e75c31367a99aaba2c3853b853fafc Mon Sep 17 00:00:00 2001 From: Kevin Israel Date: Sun, 1 Mar 2015 07:28:36 -0500 Subject: [PATCH] EditPage: Remove remnants of pre-1.16 live preview Change-Id: I6cd0c56f7e934ce43f9bd101bfb5d4ca3d7bdbad --- includes/EditPage.php | 42 +----------------------------------------- 1 file changed, 1 insertion(+), 41 deletions(-) diff --git a/includes/EditPage.php b/includes/EditPage.php index 6bdb85c3b1..9c3318e763 100644 --- a/includes/EditPage.php +++ b/includes/EditPage.php @@ -377,9 +377,6 @@ class EditPage { /** @var bool */ protected $edit; - /** @var bool */ - public $live; - /** * @param Article $article */ @@ -478,11 +475,6 @@ class EditPage { $this->importFormData( $wgRequest ); $this->firsttime = false; - if ( $this->live ) { - $this->livePreview(); - return; - } - if ( wfReadOnly() && $this->save ) { // Force preview $this->save = false; @@ -801,8 +793,7 @@ class EditPage { wfDebug( "POST DATA: " . var_export( $_POST, true ) . "\n" ); $this->preview = true; } else { - /* Fallback for live preview */ - $this->preview = $request->getCheck( 'wpPreview' ) || $request->getCheck( 'wpLivePreview' ); + $this->preview = $request->getCheck( 'wpPreview' ); $this->diff = $request->getCheck( 'wpDiff' ); // Remember whether a save was requested, so we can indicate @@ -915,7 +906,6 @@ class EditPage { * allowed. */ - $this->live = $request->getCheck( 'live' ); $this->editintro = $request->getText( 'editintro', // Custom edit intro for new sections $this->section === 'new' ? 'MediaWiki:addsection-editintro' : '' ); @@ -3824,36 +3814,6 @@ HTML return $buttons; } - /** - * Output preview text only. This can be sucked into the edit page - * via JavaScript, and saves the server time rendering the skin as - * well as theoretically being more robust on the client (doesn't - * disturb the edit box's undo history, won't eat your text on - * failure, etc). - * - * @todo This doesn't include category or interlanguage links. - * Would need to enhance it a bit, "maybe wrap them in XML - * or something..." that might also require more skin - * initialization, so check whether that's a problem. - */ - function livePreview() { - global $wgOut; - $wgOut->disable(); - header( 'Content-type: text/xml; charset=utf-8' ); - header( 'Cache-control: no-cache' ); - - $previewText = $this->getPreviewText(); - #$categories = $skin->getCategoryLinks(); - - $s = - '' . "\n" . - Xml::tags( 'livepreview', null, - Xml::element( 'preview', null, $previewText ) - #. Xml::element( 'category', null, $categories ) - ); - echo $s; - } - /** * Creates a basic error page which informs the user that * they have attempted to edit a nonexistent section. -- 2.20.1