wikimedia /
mediawiki
| @@ 2801-2814 (lines=14) @@ | ||
| 2798 | ||
| 2799 | $wgOut->addModules( 'mediawiki.action.edit.collapsibleFooter' ); |
|
| 2800 | ||
| 2801 | if ( $this->isConflict ) { |
|
| 2802 | try { |
|
| 2803 | $this->showConflict(); |
|
| 2804 | } catch ( MWContentSerializationException $ex ) { |
|
| 2805 | // this can't really happen, but be nice if it does. |
|
| 2806 | $msg = $this->context->msg( |
|
| 2807 | 'content-failed-to-parse', |
|
| 2808 | $this->contentModel, |
|
| 2809 | $this->contentFormat, |
|
| 2810 | $ex->getMessage() |
|
| 2811 | ); |
|
| 2812 | $wgOut->addWikiText( '<div class="error">' . $msg->text() . '</div>' ); |
|
| 2813 | } |
|
| 2814 | } |
|
| 2815 | ||
| 2816 | // Set a hidden field so JS knows what edit form mode we are in |
|
| 2817 | if ( $this->isConflict ) { |
|
| @@ 3375-3387 (lines=13) @@ | ||
| 3372 | ||
| 3373 | $wgOut->addHTML( '</div>' ); |
|
| 3374 | ||
| 3375 | if ( $this->formtype == 'diff' ) { |
|
| 3376 | try { |
|
| 3377 | $this->showDiff(); |
|
| 3378 | } catch ( MWContentSerializationException $ex ) { |
|
| 3379 | $msg = $this->context->msg( |
|
| 3380 | 'content-failed-to-parse', |
|
| 3381 | $this->contentModel, |
|
| 3382 | $this->contentFormat, |
|
| 3383 | $ex->getMessage() |
|
| 3384 | ); |
|
| 3385 | $wgOut->addWikiText( '<div class="error">' . $msg->text() . '</div>' ); |
|
| 3386 | } |
|
| 3387 | } |
|
| 3388 | } |
|
| 3389 | ||
| 3390 | /** |
|
