UltrasonicNXT has submitted this change and it was merged.
Change subject: Integrate WikiForum with WikiEditor
......................................................................
Integrate WikiForum with WikiEditor
If WikiEditor is installed, WikiForum will now load it automatically
Change-Id: Ia774da7150619bbfe203620c75b92a542a4de57c
---
M WikiForum.php
M WikiForumGui.php
2 files changed, 10 insertions(+), 2 deletions(-)
Approvals:
UltrasonicNXT: Verified; Looks good to me, approved
diff --git a/WikiForum.php b/WikiForum.php
index 16e737f..39e3f08 100644
--- a/WikiForum.php
+++ b/WikiForum.php
@@ -35,7 +35,7 @@
'path' => __FILE__,
'name' => 'WikiForum',
'author' => array( 'Michael Chlebek', 'Jack Phoenix', 'Adam Carter
(UltrasonicNXT)' ),
- 'version' => '2.1.2',
+ 'version' => '2.2.0',
'url' => 'https://www.mediawiki.org/wiki/Extension:WikiForum',
'descriptionmsg' => 'wikiforum-desc'
);
diff --git a/WikiForumGui.php b/WikiForumGui.php
index 23056dc..8ce69e8 100644
--- a/WikiForumGui.php
+++ b/WikiForumGui.php
@@ -232,13 +232,21 @@
$output = '';
+ if ( class_exists( 'WikiEditorHooks' ) ) {
+ $editPage = new EditPage( new Article(
SpecialPage::getTitleFor( 'WikiForum' ) ) );
+ WikiEditorHooks::editPageShowEditFormInitial(
$editPage, $wgOut );
+ $toolbar = '';
+ } else {
+ $toolbar = EditPage::getEditToolbar();
+ }
+
if ( $wgWikiForumAllowAnonymous || $wgUser->isLoggedIn() ) {
$wgOut->addModules( 'mediawiki.action.edit' ); //
Required for the edit buttons to display
$output = '<form name="frmMain" method="post" action="'
. htmlspecialchars( SpecialPage::getTitleFor( 'WikiForum' )->getFullURL(
$params ) ) . '" id="writereply">
<table class="mw-wikiforum-frame" cellspacing="10">' .
$input . '
<tr>
- <td>' . EditPage::getEditToolbar() .
'</td>
+ <td>' . $toolbar . '</td>
</tr>
<tr>
<td><textarea name="text"
id="wpTextbox1" style="height: ' . $height . ';">' . $text_prev .
'</textarea></td>
--
To view, visit https://gerrit.wikimedia.org/r/236266
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia774da7150619bbfe203620c75b92a542a4de57c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikiForum
Gerrit-Branch: master
Gerrit-Owner: UltrasonicNXT <adamr_car...@btinternet.com>
Gerrit-Reviewer: UltrasonicNXT <adamr_car...@btinternet.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
