wikimedia /
mediawiki
| @@ 2790-2803 (lines=14) @@ | ||
| 2787 | ||
| 2788 | $wgOut->addModules( 'mediawiki.action.edit.collapsibleFooter' ); |
|
| 2789 | ||
| 2790 | if ( $this->isConflict ) { |
|
| 2791 | try { |
|
| 2792 | $this->showConflict(); |
|
| 2793 | } catch ( MWContentSerializationException $ex ) { |
|
| 2794 | // this can't really happen, but be nice if it does. |
|
| 2795 | $msg = $this->context->msg( |
|
| 2796 | 'content-failed-to-parse', |
|
| 2797 | $this->contentModel, |
|
| 2798 | $this->contentFormat, |
|
| 2799 | $ex->getMessage() |
|
| 2800 | ); |
|
| 2801 | $wgOut->addWikiText( '<div class="error">' . $msg->text() . '</div>' ); |
|
| 2802 | } |
|
| 2803 | } |
|
| 2804 | ||
| 2805 | // Set a hidden field so JS knows what edit form mode we are in |
|
| 2806 | if ( $this->isConflict ) { |
|
| @@ 3255-3267 (lines=13) @@ | ||
| 3252 | ||
| 3253 | $wgOut->addHTML( '</div>' ); |
|
| 3254 | ||
| 3255 | if ( $this->formtype == 'diff' ) { |
|
| 3256 | try { |
|
| 3257 | $this->showDiff(); |
|
| 3258 | } catch ( MWContentSerializationException $ex ) { |
|
| 3259 | $msg = $this->context->msg( |
|
| 3260 | 'content-failed-to-parse', |
|
| 3261 | $this->contentModel, |
|
| 3262 | $this->contentFormat, |
|
| 3263 | $ex->getMessage() |
|
| 3264 | ); |
|
| 3265 | $wgOut->addWikiText( '<div class="error">' . $msg->text() . '</div>' ); |
|
| 3266 | } |
|
| 3267 | } |
|
| 3268 | } |
|
| 3269 | ||
| 3270 | /** |
|
