wikimedia /
mediawiki
| @@ 2723-2736 (lines=14) @@ | ||
| 2720 | ||
| 2721 | $wgOut->addModules( 'mediawiki.action.edit.collapsibleFooter' ); |
|
| 2722 | ||
| 2723 | if ( $this->isConflict ) { |
|
| 2724 | try { |
|
| 2725 | $this->showConflict(); |
|
| 2726 | } catch ( MWContentSerializationException $ex ) { |
|
| 2727 | // this can't really happen, but be nice if it does. |
|
| 2728 | $msg = wfMessage( |
|
| 2729 | 'content-failed-to-parse', |
|
| 2730 | $this->contentModel, |
|
| 2731 | $this->contentFormat, |
|
| 2732 | $ex->getMessage() |
|
| 2733 | ); |
|
| 2734 | $wgOut->addWikiText( '<div class="error">' . $msg->text() . '</div>' ); |
|
| 2735 | } |
|
| 2736 | } |
|
| 2737 | ||
| 2738 | // Set a hidden field so JS knows what edit form mode we are in |
|
| 2739 | if ( $this->isConflict ) { |
|
| @@ 3260-3272 (lines=13) @@ | ||
| 3257 | ||
| 3258 | $wgOut->addHTML( '</div>' ); |
|
| 3259 | ||
| 3260 | if ( $this->formtype == 'diff' ) { |
|
| 3261 | try { |
|
| 3262 | $this->showDiff(); |
|
| 3263 | } catch ( MWContentSerializationException $ex ) { |
|
| 3264 | $msg = wfMessage( |
|
| 3265 | 'content-failed-to-parse', |
|
| 3266 | $this->contentModel, |
|
| 3267 | $this->contentFormat, |
|
| 3268 | $ex->getMessage() |
|
| 3269 | ); |
|
| 3270 | $wgOut->addWikiText( '<div class="error">' . $msg->text() . '</div>' ); |
|
| 3271 | } |
|
| 3272 | } |
|
| 3273 | } |
|
| 3274 | ||
| 3275 | /** |
|
