wikimedia /
mediawiki
| @@ 2677-2690 (lines=14) @@ | ||
| 2674 | ||
| 2675 | $wgOut->addModules( 'mediawiki.action.edit.collapsibleFooter' ); |
|
| 2676 | ||
| 2677 | if ( $this->isConflict ) { |
|
| 2678 | try { |
|
| 2679 | $this->showConflict(); |
|
| 2680 | } catch ( MWContentSerializationException $ex ) { |
|
| 2681 | // this can't really happen, but be nice if it does. |
|
| 2682 | $msg = wfMessage( |
|
| 2683 | 'content-failed-to-parse', |
|
| 2684 | $this->contentModel, |
|
| 2685 | $this->contentFormat, |
|
| 2686 | $ex->getMessage() |
|
| 2687 | ); |
|
| 2688 | $wgOut->addWikiText( '<div class="error">' . $msg->text() . '</div>' ); |
|
| 2689 | } |
|
| 2690 | } |
|
| 2691 | ||
| 2692 | // Set a hidden field so JS knows what edit form mode we are in |
|
| 2693 | if ( $this->isConflict ) { |
|
| @@ 3214-3226 (lines=13) @@ | ||
| 3211 | ||
| 3212 | $wgOut->addHTML( '</div>' ); |
|
| 3213 | ||
| 3214 | if ( $this->formtype == 'diff' ) { |
|
| 3215 | try { |
|
| 3216 | $this->showDiff(); |
|
| 3217 | } catch ( MWContentSerializationException $ex ) { |
|
| 3218 | $msg = wfMessage( |
|
| 3219 | 'content-failed-to-parse', |
|
| 3220 | $this->contentModel, |
|
| 3221 | $this->contentFormat, |
|
| 3222 | $ex->getMessage() |
|
| 3223 | ); |
|
| 3224 | $wgOut->addWikiText( '<div class="error">' . $msg->text() . '</div>' ); |
|
| 3225 | } |
|
| 3226 | } |
|
| 3227 | } |
|
| 3228 | ||
| 3229 | /** |
|
