wikimedia /
mediawiki
| @@ 2781-2794 (lines=14) @@ | ||
| 2778 | ||
| 2779 | $wgOut->addModules( 'mediawiki.action.edit.collapsibleFooter' ); |
|
| 2780 | ||
| 2781 | if ( $this->isConflict ) { |
|
| 2782 | try { |
|
| 2783 | $this->showConflict(); |
|
| 2784 | } catch ( MWContentSerializationException $ex ) { |
|
| 2785 | // this can't really happen, but be nice if it does. |
|
| 2786 | $msg = $this->context->msg( |
|
| 2787 | 'content-failed-to-parse', |
|
| 2788 | $this->contentModel, |
|
| 2789 | $this->contentFormat, |
|
| 2790 | $ex->getMessage() |
|
| 2791 | ); |
|
| 2792 | $wgOut->addWikiText( '<div class="error">' . $msg->text() . '</div>' ); |
|
| 2793 | } |
|
| 2794 | } |
|
| 2795 | ||
| 2796 | // Set a hidden field so JS knows what edit form mode we are in |
|
| 2797 | if ( $this->isConflict ) { |
|
| @@ 3355-3367 (lines=13) @@ | ||
| 3352 | ||
| 3353 | $wgOut->addHTML( '</div>' ); |
|
| 3354 | ||
| 3355 | if ( $this->formtype == 'diff' ) { |
|
| 3356 | try { |
|
| 3357 | $this->showDiff(); |
|
| 3358 | } catch ( MWContentSerializationException $ex ) { |
|
| 3359 | $msg = $this->context->msg( |
|
| 3360 | 'content-failed-to-parse', |
|
| 3361 | $this->contentModel, |
|
| 3362 | $this->contentFormat, |
|
| 3363 | $ex->getMessage() |
|
| 3364 | ); |
|
| 3365 | $wgOut->addWikiText( '<div class="error">' . $msg->text() . '</div>' ); |
|
| 3366 | } |
|
| 3367 | } |
|
| 3368 | } |
|
| 3369 | ||
| 3370 | /** |
|
