wikimedia /
mediawiki
| @@ 2740-2753 (lines=14) @@ | ||
| 2737 | ||
| 2738 | $out->addModules( 'mediawiki.action.edit.collapsibleFooter' ); |
|
| 2739 | ||
| 2740 | if ( $this->isConflict ) { |
|
| 2741 | try { |
|
| 2742 | $this->showConflict(); |
|
| 2743 | } catch ( MWContentSerializationException $ex ) { |
|
| 2744 | // this can't really happen, but be nice if it does. |
|
| 2745 | $msg = wfMessage( |
|
| 2746 | 'content-failed-to-parse', |
|
| 2747 | $this->contentModel, |
|
| 2748 | $this->contentFormat, |
|
| 2749 | $ex->getMessage() |
|
| 2750 | ); |
|
| 2751 | $out->addWikiText( '<div class="error">' . $msg->text() . '</div>' ); |
|
| 2752 | } |
|
| 2753 | } |
|
| 2754 | ||
| 2755 | // Set a hidden field so JS knows what edit form mode we are in |
|
| 2756 | if ( $this->isConflict ) { |
|
| @@ 3283-3295 (lines=13) @@ | ||
| 3280 | ||
| 3281 | $out->addHTML( '</div>' ); |
|
| 3282 | ||
| 3283 | if ( $this->formtype == 'diff' ) { |
|
| 3284 | try { |
|
| 3285 | $this->showDiff(); |
|
| 3286 | } catch ( MWContentSerializationException $ex ) { |
|
| 3287 | $msg = wfMessage( |
|
| 3288 | 'content-failed-to-parse', |
|
| 3289 | $this->contentModel, |
|
| 3290 | $this->contentFormat, |
|
| 3291 | $ex->getMessage() |
|
| 3292 | ); |
|
| 3293 | $out->addWikiText( '<div class="error">' . $msg->text() . '</div>' ); |
|
| 3294 | } |
|
| 3295 | } |
|
| 3296 | } |
|
| 3297 | ||
| 3298 | /** |
|
